changeset 10983:58c1117f4952

[gaim-migrate @ 12817] might as well commit this. it might save him work later. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 09 Jun 2005 01:41:20 +0000
parents dcc37a23f815
children caaacfede4ae
files po/zh_CN.po
diffstat 1 files changed, 2539 insertions(+), 2250 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Jun 09 00:27:33 2005 +0000
+++ b/po/zh_CN.po	Thu Jun 09 01:41:20 2005 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-14 16:54+0800\n"
-"PO-Revision-Date: 2005-03-14 17:02+0800\n"
+"POT-Creation-Date: 2005-06-09 03:10+0800\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"
 "MIME-Version: 1.0\n"
@@ -16,19 +16,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/autorecon.c:281
+#: plugins/autorecon.c:292
 msgid "Error Message Suppression"
 msgstr "错误消息屏蔽"
 
-#: plugins/autorecon.c:285
+#: plugins/autorecon.c:296
 msgid "Hide Disconnect Errors"
 msgstr "隐藏断开连接错误"
 
-#: plugins/autorecon.c:289
+#: plugins/autorecon.c:300
 msgid "Hide Login Errors"
 msgstr "隐藏登录错误"
 
-#: plugins/autorecon.c:293
+#: plugins/autorecon.c:304
 msgid "Hide Reconnecting Dialog"
 msgstr "隐藏重新连接错误"
 
@@ -38,7 +38,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:317
+#: plugins/autorecon.c:328
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
@@ -46,27 +46,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:320 plugins/autorecon.c:322
+#: plugins/autorecon.c:331 plugins/autorecon.c:333
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#: plugins/chkmail.c:92 plugins/chkmail.c:114 plugins/chkmail.c:123
-msgid "Mail Server"
-msgstr "邮件服务器"
-
-#. XXX - This needs to use ngettext()
-#: plugins/chkmail.c:132
-#, c-format
-msgid "%s (%d new/%d total)"
-msgstr "%s (%d 封新邮件/共 %d 封)"
-
-#: plugins/chkmail.c:194
-msgid "Check Mail"
-msgstr "检查邮件"
-
-#: plugins/chkmail.c:198
-msgid "Check email every X seconds.\n"
-msgstr "每隔 X 秒检查邮件。\n"
+#. *< 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..."
@@ -93,16 +93,16 @@
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
+"The default values (offline = 4, away = 2, and idle = 1) will use what used "
+"to be\n"
+"the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "分值最低的好友是联系人中有优先权的好友。\n"
 "使用默认值(离线=4,离开=2,瞌睡=1)时,内置顺序将为: 在线->瞌睡->离开+瞌睡->离"
 "线。"
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for Account..."
+msgid "Point values to use for account..."
 msgstr "账户的权值..."
 
 #. *< type
@@ -130,6 +130,94 @@
 "in contact priority computations."
 msgstr "允许在进行好友优先级比较时为瞌睡/离开/离线状态所用的权值。"
 
+#: plugins/docklet/docklet.c:136
+msgid "New Message..."
+msgstr "新消息..."
+
+#: plugins/docklet/docklet.c:137
+msgid "Join A Chat..."
+msgstr "加入聊天..."
+
+#: plugins/docklet/docklet.c:170
+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
+msgid "Away"
+msgstr "离开"
+
+#: plugins/docklet/docklet.c:182
+msgid "Back"
+msgstr "回来"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "静音"
+
+#: plugins/docklet/docklet.c:198 src/gtkft.c:652
+msgid "File Transfers"
+msgstr "文件传送"
+
+#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2322
+msgid "Accounts"
+msgstr "账户"
+
+#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2162
+msgid "Preferences"
+msgstr "首选项"
+
+#: plugins/docklet/docklet.c:204
+msgid "Quit"
+msgstr "退出"
+
+#: plugins/docklet/docklet.c:529
+msgid "Tray Icon Configuration"
+msgstr "托盘图标配置"
+
+#: plugins/docklet/docklet.c:533
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "直到点击托盘图标才显示新消息(_H)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:559
+msgid "System Tray Icon"
+msgstr "系统托盘图标"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:562
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "在系统托盘中显示 Gaim 的图标。"
+
+#. *  description
+#: plugins/docklet/docklet.c:564
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr ""
+"在系统的托盘区(如 GNOME,KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
+"并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
+"似,还可以将消息存入队列。"
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -145,95 +233,13 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 离开"
 
-#: plugins/docklet/docklet.c:140
-msgid "Auto-login"
-msgstr "自动登录"
-
-#: plugins/docklet/docklet.c:143
-msgid "New Message..."
-msgstr "新消息..."
-
-#: plugins/docklet/docklet.c:144
-msgid "Join A Chat..."
-msgstr "加入聊天..."
-
-#: plugins/docklet/docklet.c:181
-msgid "New..."
-msgstr "新建..."
-
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1694 src/gtkstatusbox.c:248
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:179
-#: src/protocols/irc/msgs.c:212 src/protocols/jabber/buddy.c:1080
-#: src/protocols/jabber/jabber.c:994 src/protocols/msn/msn.c:539
-#: src/protocols/novell/novell.c:2811 src/protocols/novell/novell.c:2928
-#: src/protocols/novell/novell.c:2980 src/protocols/oscar/oscar.c:691
-#: src/protocols/oscar/oscar.c:5760 src/protocols/oscar/oscar.c:6826
-#: src/protocols/oscar/oscar.c:7047 src/protocols/silc/buddy.c:1393
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:2959
-#: src/protocols/zephyr/zephyr.c:2225 src/status.c:160
-msgid "Away"
-msgstr "离开"
-
-#: plugins/docklet/docklet.c:197
-msgid "Back"
-msgstr "回来"
-
-#: plugins/docklet/docklet.c:206
-msgid "Mute Sounds"
-msgstr "静音"
-
-#: plugins/docklet/docklet.c:213 src/gtkft.c:621
-msgid "File Transfers"
-msgstr "文件传送"
-
-#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2298
-msgid "Accounts"
-msgstr "账户"
-
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2195
-msgid "Preferences"
-msgstr "首选项"
-
-#: plugins/docklet/docklet.c:219
-msgid "Quit"
-msgstr "退出"
-
-#: plugins/docklet/docklet.c:550
-msgid "Tray Icon Configuration"
-msgstr "托盘图标配置"
-
-#: plugins/docklet/docklet.c:554
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "直到点击托盘图标才显示新消息(_H)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:580
-msgid "System Tray Icon"
-msgstr "系统托盘图标"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:583
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "在系统托盘中显示 Gaim 的图标。"
-
-#. *  description
-#: plugins/docklet/docklet.c:585
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"在系统的托盘区(如 GNOME,KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
-"并允许快速访问常用的功能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类"
-"似,还可以将消息存入队列。"
+#: 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"
@@ -281,7 +287,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:248
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Gaim 文件控制"
 
@@ -289,63 +295,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:251 plugins/filectl.c:253
+#: plugins/filectl.c:248 plugins/filectl.c:250
 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:751
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"将 %s 指派给套接字失败:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:775
-msgid "Unable to open socket"
-msgstr "无法打开套接字"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaim-remote/remote.c:825
-msgid "Remote Control"
-msgstr "远程控制"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/gaim-remote/remote.c:828
-msgid "Provides remote control for gaim applications."
-msgstr "提供 gaim 程序的远程控制。"
-
-#. *  description
-#: plugins/gaim-remote/remote.c:830
-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
@@ -431,12 +384,12 @@
 msgstr "选择界面字体"
 
 #: plugins/gaimrc.c:343
-msgid "Gtk interface font"
-msgstr "Gtk 界面字体"
+msgid "GTK+ Interface Font"
+msgstr "GTK+ 界面字体"
 
 #: plugins/gaimrc.c:362
-msgid "Gtk text shortcut theme"
-msgstr "Gtk 文字快捷方式主题"
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ 文字快捷方式主题"
 
 #: plugins/gaimrc.c:460
 msgid "Gaim GTK+ Theme Control"
@@ -446,21 +399,74 @@
 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:221
+#: plugins/gestures/gestures.c:241
 msgid "Mouse Gestures Configuration"
 msgstr "鼠标手势配置"
 
-#: plugins/gestures/gestures.c:228
+#: plugins/gestures/gestures.c:248
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
-#: plugins/gestures/gestures.c:233
+#: plugins/gestures/gestures.c:253
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:245
+#: plugins/gestures/gestures.c:265
 msgid "_Visual gesture display"
 msgstr "可视手势显示(_V)"
 
@@ -470,19 +476,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:294
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:297
 msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#: plugins/gestures/gestures.c:279
+#: plugins/gestures/gestures.c:299
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -499,9 +505,9 @@
 "向上再向右可切换到下个对话。"
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2014
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:607
-#: src/protocols/msn/msn.c:1486 src/protocols/trepia/trepia.c:399
+#: 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
 msgid "Name"
 msgstr "名称"
 
@@ -516,13 +522,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7411
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7263
 msgid "Search"
 msgstr "搜索"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4325
-#: src/gtkblist.c:4703
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4309
+#: src/gtkblist.c:4686
 msgid "Group:"
 msgstr "组:"
 
@@ -558,27 +564,32 @@
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:517 src/blist.c:1226 src/blist.c:1440 src/gtkblist.c:4145
+#: 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
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:345
+#: plugins/gevolution/gevolution.c:349
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: plugins/gevolution/gevolution.c:348
+#: plugins/gevolution/gevolution.c:352
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
-#: plugins/gevolution/gevolution.c:378 plugins/idle.c:52 src/gtkconn.c:426
+#: plugins/gevolution/gevolution.c:382 plugins/idle.c:52 src/gtkconn.c:432
 msgid "Account"
 msgstr "账户"
 
@@ -588,7 +599,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -596,7 +607,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供与 Ximian Evolution 的集成。"
 
@@ -622,8 +633,8 @@
 msgstr "额外信息:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:393
-#: src/gtkaccount.c:415 src/protocols/oscar/oscar.c:597
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:395
+#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:595
 msgid "Buddy Icon"
 msgstr "好友图标"
 
@@ -639,15 +650,33 @@
 msgid "E-mail:"
 msgstr "电子邮件:"
 
-#: plugins/history.c:92
+#. *< 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
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:94
+#: plugins/history.c:95
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:95
+#: plugins/history.c:96
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -754,73 +783,73 @@
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: plugins/notify.c:643
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:642
+#: plugins/notify.c:647
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:649
+#: plugins/notify.c:654
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
-#: plugins/notify.c:656
+#: plugins/notify.c:661
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: plugins/notify.c:669
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:671
+#: plugins/notify.c:676
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: plugins/notify.c:690
+#: plugins/notify.c:695
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: plugins/notify.c:703
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. Raise window method button
-#: plugins/notify.c:706
+#: plugins/notify.c:711
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: plugins/notify.c:719
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: plugins/notify.c:724
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: plugins/notify.c:731
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: plugins/notify.c:739
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: plugins/notify.c:747
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: plugins/notify.c:756
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -830,7 +859,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: plugins/notify.c:846
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -838,7 +867,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: plugins/notify.c:849 plugins/notify.c:851
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读消息。"
 
@@ -859,15 +888,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: plugins/raw.c:149
+#: plugins/raw.c:151
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:151
+#: plugins/raw.c:153
 msgid "Lets you send raw input to text-based protocols."
 msgstr "允许您发送原样输入基于文本的协议。"
 
-#: plugins/raw.c:152
+#: plugins/raw.c:154
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -932,7 +961,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:608
+#: plugins/signals-test.c:624
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -940,7 +969,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:611 plugins/signals-test.c:613
+#: plugins/signals-test.c:627 plugins/signals-test.c:629
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -962,35 +991,43 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:417
+#: plugins/spellchk.c:1602
+msgid "Duplicate Correction"
+msgstr ""
+
+#: plugins/spellchk.c:1603
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: plugins/spellchk.c:1748
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:441
+#: plugins/spellchk.c:1772
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:453
+#: plugins/spellchk.c:1784
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:479
+#: plugins/spellchk.c:1810
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:486
+#: plugins/spellchk.c:1817
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:500
+#: plugins/spellchk.c:1831
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:542
+#: plugins/spellchk.c:1873
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:544 plugins/spellchk.c:545
+#: plugins/spellchk.c:1875 plugins/spellchk.c:1876
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -1000,6 +1037,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
+#: plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+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"
@@ -1030,24 +1085,6 @@
 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"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "提供 SSL 支持库。"
-
 #: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
@@ -1148,7 +1185,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:295
+#: plugins/timestamp.c:287
 msgid "Timestamp"
 msgstr "时间戳"
 
@@ -1156,35 +1193,35 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:298 plugins/timestamp.c:300
+#: plugins/timestamp.c:290 plugins/timestamp.c:292
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:404
-#: plugins/win32/transparency/win2ktrans.c:435
+#: plugins/win32/transparency/win2ktrans.c:413
+#: plugins/win32/transparency/win2ktrans.c:444
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:385
+#: plugins/win32/transparency/win2ktrans.c:394
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:386
+#: plugins/win32/transparency/win2ktrans.c:395
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:396
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:421
+#: plugins/win32/transparency/win2ktrans.c:430
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:431
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -1194,19 +1231,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:480
+#: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:483
+#: plugins/win32/transparency/win2ktrans.c:492
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:485
+#: plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1231,8 +1268,8 @@
 msgstr "Windows 启动时启动 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3424
-#: src/gtkprefs.c:2111
+#: plugins/win32/winprefs/winprefs.c:338 src/gtkblist.c:3404
+#: src/gtkprefs.c:2116
 msgid "Buddy List"
 msgstr "好友列表"
 
@@ -1251,8 +1288,8 @@
 msgstr "好友列表窗口常居顶端(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:867
-#: src/gtkprefs.c:2112
+#: plugins/win32/winprefs/winprefs.c:358 src/gtkprefs.c:937
+#: src/gtkprefs.c:2117
 msgid "Conversations"
 msgstr "对话"
 
@@ -1268,99 +1305,122 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: src/account.c:532
+#: src/account.c:631
 msgid "accounts"
 msgstr "账户"
 
-#: src/account.c:732 src/protocols/jabber/jabber.c:1050
-msgid "New passwords do not match."
-msgstr "新密码不相同。"
-
-#: src/account.c:741
-msgid "Fill out all fields completely."
-msgstr "完全填入所有字段。"
-
-#: src/account.c:766
-msgid "Original password"
-msgstr "旧密码"
-
-#: src/account.c:773
-msgid "New password"
-msgstr "新密码"
-
-#: src/account.c:780
-msgid "New password (again)"
-msgstr "再次输入新密码"
-
-#: src/account.c:786
-#, c-format
-msgid "Change password for %s"
-msgstr "更改 %s 的密码"
-
-#: src/account.c:794
-msgid "Please enter your current password and your new password."
-msgstr "请输入您目前的密码和新密码。"
+#: src/account.c:763
+msgid "Password is required to sign on."
+msgstr "需要密码才能登入。"
+
+#: src/account.c:787
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "输入 %s(%s) 的密码"
+
+#: src/account.c:789
+msgid "Enter Password"
+msgstr "输入密码"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:797 src/connection.c:187 src/gtkblist.c:2654
-#: src/gtkdialogs.c:472 src/gtkdialogs.c:614 src/gtkdialogs.c:669
-#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1097
+#: 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:2398
-#: src/protocols/oscar/oscar.c:3661 src/protocols/oscar/oscar.c:3755
-#: src/protocols/oscar/oscar.c:7140 src/protocols/oscar/oscar.c:7265
-#: src/protocols/oscar/oscar.c:7290 src/protocols/oscar/oscar.c:7342
-#: 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:1689 src/protocols/silc/silc.c:706
-#: src/protocols/yahoo/yahoo.c:2682 src/protocols/yahoo/yahoo.c:2691
-#: src/request.h:1244
+#: 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/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
 msgid "OK"
 msgstr "确定"
 
-#: src/account.c:798 src/account.c:836 src/connection.c:188
-#: src/gtkaccount.c:2004 src/gtkaccount.c:2458 src/gtkblist.c:2655
-#: src/gtkblist.c:4741 src/gtkdialogs.c:473 src/gtkdialogs.c:615
-#: src/gtkdialogs.c:670 src/gtkdialogs.c:768 src/gtkdialogs.c:790
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:854 src/gtkdialogs.c:916
-#: src/gtkdialogs.c:958 src/gtkdialogs.c:996 src/gtkimhtmltoolbar.c:443
-#: src/gtkprivacy.c:585 src/gtkprivacy.c:598 src/gtkprivacy.c:623
-#: src/gtkprivacy.c:634 src/gtkrequest.c:260 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:568 src/protocols/jabber/chat.c:777
-#: src/protocols/jabber/jabber.c:676 src/protocols/jabber/jabber.c:1098
+#: 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/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/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:1580 src/protocols/oscar/oscar.c:2399
-#: src/protocols/oscar/oscar.c:3619 src/protocols/oscar/oscar.c:3662
-#: src/protocols/oscar/oscar.c:3699 src/protocols/oscar/oscar.c:3756
-#: src/protocols/oscar/oscar.c:7141 src/protocols/oscar/oscar.c:7266
-#: src/protocols/oscar/oscar.c:7291 src/protocols/oscar/oscar.c:7343
-#: src/protocols/oscar/oscar.c:7412 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:1690 src/protocols/silc/silc.c:707
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2683
-#: src/protocols/yahoo/yahoo.c:2692 src/request.h:1244 src/request.h:1254
+#: 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
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:827
+#: src/account.c:813 src/connection.c:95
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "缺少 %s 的协议插件"
+
+#: src/account.c:815 src/connection.c:98
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: src/account.c:877 src/protocols/jabber/jabber.c:1054
+msgid "New passwords do not match."
+msgstr "新密码不相同。"
+
+#: src/account.c:886
+msgid "Fill out all fields completely."
+msgstr "完全填入所有字段。"
+
+#: src/account.c:911
+msgid "Original password"
+msgstr "旧密码"
+
+#: src/account.c:918
+msgid "New password"
+msgstr "新密码"
+
+#: src/account.c:925
+msgid "New password (again)"
+msgstr "再次输入新密码"
+
+#: src/account.c:931
+#, c-format
+msgid "Change password for %s"
+msgstr "更改 %s 的密码"
+
+#: src/account.c:939
+msgid "Please enter your current password and your new password."
+msgstr "请输入您目前的密码和新密码。"
+
+#: src/account.c:972
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: src/account.c:835 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:567
+#: src/account.c:980 src/gtkrequest.c:267 src/protocols/jabber/buddy.c:568
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "保存"
 
-#: src/account.c:1240 src/gtkft.c:158 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/buddy.c:1087
+#: 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
 msgid "Unknown"
 msgstr "未知"
@@ -1369,11 +1429,11 @@
 msgid "buddy list"
 msgstr "好友列表"
 
-#: src/blist.c:1132
+#: src/blist.c:1141
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1813
+#: src/blist.c:1822
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1385,37 +1445,19 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是其账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:1822
+#: src/blist.c:1831
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/connection.c:113 src/connection.c:159
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "缺少 %s 的协议插件"
-
-#: src/connection.c:117
+#: src/connection.c:97
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: src/connection.c:163
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: src/connection.c:183
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "输入 %s(%s) 的密码"
-
-#: src/connection.c:185
-msgid "Enter Password"
-msgstr "输入密码"
-
 #: src/conversation.c:236
 msgid "Unable to send message: The message is too large."
 msgstr "无法发送消息: 消息太大。"
 
-#: src/conversation.c:239
+#: src/conversation.c:239 src/conversation.c:252
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "无法给 %s 发送消息。"
@@ -1428,72 +1470,71 @@
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:252
-#, c-format
-msgid "Unable to send messge to %s."
-msgstr "无法给 %s 发送消息。"
-
-#: src/conversation.c:2083
+#: src/conversation.c:1956
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:2086
+#: src/conversation.c:1959
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2182
+#: src/conversation.c:2056
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: src/conversation.c:2185
+#: src/conversation.c:2059
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2226
+#: src/conversation.c:2101
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2228
+#: src/conversation.c:2103
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2301
+#: src/conversation.c:2180
 #, c-format
 msgid "(+%d more)"
 msgstr "(还有 %d 人)"
 
-#: src/conversation.c:2303
+#: src/conversation.c:2182
 #, c-format
 msgid " left the room (%s)."
 msgstr "离开了聊天室(%s)。"
 
-#: src/conversation.c:2708
+#: src/conversation.c:2587
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2710
+#: src/conversation.c:2589
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: src/conversation.c:2712 src/gtkprefs.c:1221
+#: src/conversation.c:2591 src/gtkprefs.c:1295
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2714
+#: src/conversation.c:2593
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2716
+#: src/conversation.c:2595
 msgid "By account"
 msgstr "按账户"
 
-#: src/ft.c:149 src/protocols/msn/msn.c:368
+#: src/desktopitem.c:286 src/desktopitem.c:875
+msgid "No name"
+msgstr "无名称"
+
+#: src/ft.c:151 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1502,7 +1543,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:153
+#: src/ft.c:155
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1511,7 +1552,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: src/ft.c:157
+#: src/ft.c:159
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1520,35 +1561,35 @@
 "访问 %s出错:\n"
 "%s。\n"
 
-#: src/ft.c:189
+#: src/ft.c:192
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/ft.c:199
+#: src/ft.c:202
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: src/ft.c:206
+#: src/ft.c:211
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: src/ft.c:264
+#: src/ft.c:269
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/ft.c:272
+#: src/ft.c:276
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: src/ft.c:313
+#: src/ft.c:317
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: src/ft.c:317
+#: src/ft.c:321
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1559,55 +1600,55 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: src/ft.c:374
+#: src/ft.c:379
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:392
+#: src/ft.c:400
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: src/ft.c:401
+#: src/ft.c:411
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "开始来自 %2$s 的 %1$s 传送"
 
-#: src/ft.c:555
+#: src/ft.c:565
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: src/ft.c:558
+#: src/ft.c:568
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: src/ft.c:943
+#: src/ft.c:952
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: src/ft.c:949
+#: src/ft.c:957
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: src/ft.c:1007
+#: src/ft.c:1014
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: src/ft.c:1013
+#: src/ft.c:1019
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: src/ft.c:1070
+#: src/ft.c:1076
 #, c-format
 msgid "File transfer to %s failed.\n"
 msgstr "给 %s 传送文件失败。\n"
 
-#: src/ft.c:1072
+#: src/ft.c:1078
 #, c-format
 msgid "File transfer from %s failed.\n"
 msgstr "来自 %s 的文件传送失败。\n"
@@ -1748,7 +1789,7 @@
 "\n"
 "发送即时消息\n"
 
-#: src/gtkaccount.c:343
+#: src/gtkaccount.c:345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1760,161 +1801,161 @@
 "<b>图像大小:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:663
+#: src/gtkaccount.c:665
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/gtkaccount.c:680 src/gtkft.c:554
+#: src/gtkaccount.c:682 src/gtkft.c:584
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/gtkaccount.c:685 src/gtkblist.c:4297
+#: src/gtkaccount.c:687 src/gtkblist.c:4278
 msgid "Screen Name:"
 msgstr "用户名:"
 
-#: src/gtkaccount.c:758
+#: src/gtkaccount.c:760
 msgid "Password:"
 msgstr "密码:"
 
-#: src/gtkaccount.c:763 src/gtkblist.c:4311 src/gtkblist.c:4688
+#: src/gtkaccount.c:765 src/gtkblist.c:4292 src/gtkblist.c:4671
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:769
 msgid "Remember password"
 msgstr "记住密码"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:812
+#: src/gtkaccount.c:814
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/gtkaccount.c:825
+#: src/gtkaccount.c:827
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: src/gtkaccount.c:834
+#: src/gtkaccount.c:836
 msgid "Buddy icon:"
 msgstr "好友图标:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:923
+#: src/gtkaccount.c:925
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1061 src/gtkaccount.c:1108
+#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
 #. No Proxy
-#: src/gtkaccount.c:1067 src/gtkaccount.c:1115
+#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
 msgid "No Proxy"
 msgstr "无代理"
 
 #. HTTP
-#: src/gtkaccount.c:1073 src/gtkaccount.c:1122
+#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1079 src/gtkaccount.c:1129
+#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1085 src/gtkaccount.c:1136
+#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1091 src/gtkaccount.c:1143 src/gtkprefs.c:1024
+#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1096
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
-#: src/gtkaccount.c:1182
+#: src/gtkaccount.c:1184
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: src/gtkaccount.c:1186
+#: src/gtkaccount.c:1188
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
-#: src/gtkaccount.c:1202
+#: src/gtkaccount.c:1204
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/gtkaccount.c:1220 src/gtkprefs.c:1018
+#: src/gtkaccount.c:1222 src/gtkprefs.c:1090
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/gtkaccount.c:1229 src/gtkprefs.c:1045
+#: src/gtkaccount.c:1231 src/gtkprefs.c:1117
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/gtkaccount.c:1233 src/gtkprefs.c:1063
+#: src/gtkaccount.c:1235 src/gtkprefs.c:1135
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: src/gtkaccount.c:1241
+#: src/gtkaccount.c:1243
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: src/gtkaccount.c:1246 src/gtkprefs.c:1100
+#: src/gtkaccount.c:1248 src/gtkprefs.c:1172
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/gtkaccount.c:1617
+#: src/gtkaccount.c:1625
 msgid "Add Account"
 msgstr "添加账户"
 
-#: src/gtkaccount.c:1619
+#: src/gtkaccount.c:1627
 msgid "Modify Account"
 msgstr "修改账户"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1643
+#: src/gtkaccount.c:1651
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/gtkaccount.c:1644
+#: src/gtkaccount.c:1652
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
 #. Register button
-#: src/gtkaccount.c:1666 src/protocols/jabber/jabber.c:675
+#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:679
 msgid "Register"
 msgstr "注册"
 
-#: src/gtkaccount.c:1998 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/gtkaccount.c:2003 src/gtkrequest.c:263 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "删除"
 
-#: src/gtkaccount.c:2068 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4308
+#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
+#: src/protocols/oscar/oscar.c:4295
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/gtkaccount.c:2091
+#: src/gtkaccount.c:2115
 msgid "Enabled"
 msgstr "已启用"
 
-#: src/gtkaccount.c:2099
+#: src/gtkaccount.c:2123
 msgid "Protocol"
 msgstr "协议"
 
-#: src/gtkaccount.c:2433
+#: src/gtkaccount.c:2457
 #, 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:2447
+#: src/gtkaccount.c:2471
 msgid ""
 "\n"
 "\n"
@@ -1924,248 +1965,248 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/gtkaccount.c:2451
+#: src/gtkaccount.c:2475
 msgid "Information"
 msgstr "信息"
 
-#: src/gtkaccount.c:2455
+#: src/gtkaccount.c:2479
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: src/gtkaccount.c:2457 src/gtkblist.c:4740 src/gtkconv.c:1453
-#: src/gtkrequest.c:264 src/protocols/oscar/oscar.c:3933
+#: src/gtkaccount.c:2481 src/gtkblist.c:4723 src/gtkconv.c:1504
+#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:3920
 #: src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "添加"
 
-#: src/gtkblist.c:844
+#: src/gtkblist.c:824
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: src/gtkblist.c:865
+#: src/gtkblist.c:845
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: src/gtkblist.c:876 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:856 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/gtkblist.c:1177
+#: src/gtkblist.c:1157
 msgid "Get _Info"
 msgstr "获取信息(_I)"
 
-#: src/gtkblist.c:1180
+#: src/gtkblist.c:1160
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: src/gtkblist.c:1186
+#: src/gtkblist.c:1166
 msgid "_Send File"
 msgstr "发送文件(_S)"
 
-#: src/gtkblist.c:1192
+#: src/gtkblist.c:1172
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:1196 src/gtkblist.c:1200 src/gtkblist.c:1298
-#: src/gtkblist.c:1321
+#: src/gtkblist.c:1176 src/gtkblist.c:1180 src/gtkblist.c:1278
+#: src/gtkblist.c:1301
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: src/gtkblist.c:1211
+#: src/gtkblist.c:1191
 msgid "_Alias Buddy..."
 msgstr "好友别名(_A)..."
 
-#: src/gtkblist.c:1213
+#: src/gtkblist.c:1193
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: src/gtkblist.c:1215
+#: src/gtkblist.c:1195
 msgid "Alias Contact..."
 msgstr "给联系人起别名..."
 
-#: src/gtkblist.c:1218 src/gtkdialogs.c:852 src/gtkdialogs.c:853
+#: src/gtkblist.c:1198 src/gtkdialogs.c:898 src/gtkdialogs.c:899
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: src/gtkblist.c:1222 src/gtkblist.c:1306 src/gtkblist.c:1327
+#: src/gtkblist.c:1202 src/gtkblist.c:1286 src/gtkblist.c:1307
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: src/gtkblist.c:1224 src/gtkblist.c:1308 src/gtkblist.c:1329
-#: src/gtkconn.c:166
+#: src/gtkblist.c:1204 src/gtkblist.c:1288 src/gtkblist.c:1309
+#: src/gtkconn.c:172
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:1270
+#: src/gtkblist.c:1250
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:1272
+#: src/gtkblist.c:1252
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:1274
+#: src/gtkblist.c:1254
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:1276
+#: src/gtkblist.c:1256
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1294 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1274 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/gtkstock.c:101
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1296
+#: src/gtkblist.c:1276
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: src/gtkblist.c:1334 src/gtkblist.c:1357
+#: src/gtkblist.c:1314 src/gtkblist.c:1337
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: src/gtkblist.c:1362
+#: src/gtkblist.c:1342
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: src/gtkblist.c:1579 src/gtkblist.c:1589 src/gtkblist.c:3557
-#: src/gtkblist.c:3560
+#: src/gtkblist.c:1559 src/gtkblist.c:1569 src/gtkblist.c:3537
+#: src/gtkblist.c:3540
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: src/gtkblist.c:2030 src/gtkconv.c:4143 src/gtkpounce.c:314
+#: src/gtkblist.c:2010 src/gtkconv.c:4165 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:2599
+#: src/gtkblist.c:2579
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2600
+#: src/gtkblist.c:2580
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: src/gtkblist.c:2601
+#: src/gtkblist.c:2581
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:2602
+#: src/gtkblist.c:2582
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: src/gtkblist.c:2603
+#: src/gtkblist.c:2583
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: src/gtkblist.c:2605
+#: src/gtkblist.c:2585
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:2606
+#: src/gtkblist.c:2586
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:2607
+#: src/gtkblist.c:2587
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:2608
+#: src/gtkblist.c:2588
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:2609
+#: src/gtkblist.c:2589
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:2611
+#: src/gtkblist.c:2591
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2614
+#: src/gtkblist.c:2594
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:2615
+#: src/gtkblist.c:2595
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:2616
+#: src/gtkblist.c:2596
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具(T)/账户操作(_T)"
 
-#: src/gtkblist.c:2617
+#: src/gtkblist.c:2597
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具(T)/插件操作(_U)"
 
-#: src/gtkblist.c:2619
+#: src/gtkblist.c:2599
 msgid "/Tools/_Statuses"
 msgstr "/工具(T)/状态(_S)"
 
-#: src/gtkblist.c:2620
+#: src/gtkblist.c:2600
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:2621
+#: src/gtkblist.c:2601
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: src/gtkblist.c:2622
+#: src/gtkblist.c:2602
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:2623
+#: src/gtkblist.c:2603
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: src/gtkblist.c:2624
+#: src/gtkblist.c:2604
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: src/gtkblist.c:2626
+#: src/gtkblist.c:2606
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
-#: src/gtkblist.c:2627
+#: src/gtkblist.c:2607
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:2630
+#: src/gtkblist.c:2610
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:2631
+#: src/gtkblist.c:2611
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:2632
+#: src/gtkblist.c:2612
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:2633
+#: src/gtkblist.c:2613
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:2651
+#: src/gtkblist.c:2631
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/gtkblist.c:2651
+#: src/gtkblist.c:2631
 msgid "New group name"
 msgstr "新组名称"
 
-#: src/gtkblist.c:2652
+#: src/gtkblist.c:2632
 msgid "Please enter a new name for the selected group."
 msgstr "请输入选中组的新名字。"
 
-#: src/gtkblist.c:2683 src/gtkblist.c:2750
+#: src/gtkblist.c:2663 src/gtkblist.c:2732
 #, c-format
 msgid ""
 "\n"
@@ -2174,7 +2215,7 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:2759
+#: src/gtkblist.c:2741
 #, c-format
 msgid ""
 "\n"
@@ -2183,7 +2224,7 @@
 "\n"
 "<b>联系人别名:</b> %s"
 
-#: src/gtkblist.c:2767
+#: src/gtkblist.c:2749
 #, c-format
 msgid ""
 "\n"
@@ -2192,7 +2233,7 @@
 "\n"
 "<b>别名:</b> %s"
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2757
 #, c-format
 msgid ""
 "\n"
@@ -2201,7 +2242,7 @@
 "\n"
 "<b>昵称:</b> %s"
 
-#: src/gtkblist.c:2784
+#: src/gtkblist.c:2766
 #, c-format
 msgid ""
 "\n"
@@ -2210,7 +2251,7 @@
 "\n"
 "<b>登入:</b> %s"
 
-#: src/gtkblist.c:2796
+#: src/gtkblist.c:2778
 #, c-format
 msgid ""
 "\n"
@@ -2219,15 +2260,7 @@
 "\n"
 "<b>瞌睡:</b> %s"
 
-#: src/gtkblist.c:2800
-msgid ""
-"\n"
-"<b>Idle</b>"
-msgstr ""
-"\n"
-"<b>瞌睡</b>"
-
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2791
 #, c-format
 msgid ""
 "\n"
@@ -2236,12 +2269,12 @@
 "\n"
 "<b>上次看见:</b> %s 以前"
 
-#: src/gtkblist.c:2820
+#: src/gtkblist.c:2800
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2821
+#: src/gtkblist.c:2801
 #, c-format
 msgid ""
 "\n"
@@ -2250,7 +2283,7 @@
 "\n"
 "<b>警告:</b> %s"
 
-#: src/gtkblist.c:2827
+#: src/gtkblist.c:2807
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2258,7 +2291,7 @@
 "\n"
 "<b>状态:</b> 离线"
 
-#: src/gtkblist.c:2848
+#: src/gtkblist.c:2828
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2266,7 +2299,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:2850
+#: src/gtkblist.c:2830
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2274,7 +2307,7 @@
 "\n"
 "<b>状态:</b> 可怕"
 
-#: src/gtkblist.c:2852
+#: src/gtkblist.c:2832
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2282,107 +2315,103 @@
 "\n"
 "<b>状态:</b> 混乱"
 
-#: src/gtkblist.c:3094
+#: src/gtkblist.c:3074
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:3096
+#: src/gtkblist.c:3076
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:3099
+#: src/gtkblist.c:3079
 msgid "Idle "
 msgstr "瞌睡 "
 
-#: src/gtkblist.c:3105
+#: src/gtkblist.c:3085
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:3109
+#: src/gtkblist.c:3089
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:3228
+#: src/gtkblist.c:3208
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: src/gtkblist.c:3229 src/gtkblist.c:3263
+#: src/gtkblist.c:3209 src/gtkblist.c:3243
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: src/gtkblist.c:3230
+#: src/gtkblist.c:3210
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: src/gtkblist.c:3231
+#: src/gtkblist.c:3211
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: src/gtkblist.c:3232
+#: src/gtkblist.c:3212
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: src/gtkblist.c:3233
+#: src/gtkblist.c:3213
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: src/gtkblist.c:3266
+#: src/gtkblist.c:3246
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: src/gtkblist.c:3269
+#: src/gtkblist.c:3249
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: src/gtkblist.c:3337 src/gtkprefs.c:1708 src/protocols/jabber/jabber.c:936
-msgid "None"
-msgstr "无"
-
-#: src/gtkblist.c:3339
+#: src/gtkblist.c:3319
 msgid "Alphabetical"
 msgstr "按字母序"
 
-#: src/gtkblist.c:3340
+#: src/gtkblist.c:3320
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:3341
+#: src/gtkblist.c:3321
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:3452
+#: src/gtkblist.c:3432
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:3453
+#: src/gtkblist.c:3433
 msgid "/Tools/Account Actions"
 msgstr "/工具(T)/账户操作(T)"
 
-#: src/gtkblist.c:3454
+#: src/gtkblist.c:3434
 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:3553
+#: src/gtkblist.c:3533
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:3555
+#: src/gtkblist.c:3535
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:4251 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:4232 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:2613
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2708
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/gtkblist.c:4275
+#: src/gtkblist.c:4256
 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. "
@@ -2392,47 +2421,122 @@
 "的话,别名将会替代用户名显示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4335 src/gtkblist.c:4668
+#: src/gtkblist.c:4319 src/gtkblist.c:4651
 msgid "Account:"
 msgstr "账户:"
 
-#: src/gtkblist.c:4601
+#: src/gtkblist.c:4584
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: src/gtkblist.c:4617
+#: src/gtkblist.c:4600
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/gtkblist.c:4634
+#: src/gtkblist.c:4617
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/gtkblist.c:4658
+#: src/gtkblist.c:4641
 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:4737
+#: src/gtkblist.c:4720
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/gtkblist.c:4738
+#: src/gtkblist.c:4721
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: src/gtkblist.c:5288 src/gtkblist.c:5384
+#: src/gtkblist.c:5271 src/gtkblist.c:5367
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/gtkconn.c:166 src/gtkconn.c:399
+#: 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
+#, 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"
 msgstr "重新连接(_R)"
 
-#: src/gtkconn.c:363
+#: src/gtkconn.c:369
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2445,36 +2549,36 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:365
+#: src/gtkconn.c:371
 msgid "Reason Unknown."
 msgstr "原因未知。"
 
-#: src/gtkconn.c:373
+#: src/gtkconn.c:379
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: src/gtkconn.c:404
+#: src/gtkconn.c:410
 msgid "Reconnect _All"
 msgstr "全部重新连接(_A)"
 
-#: src/gtkconn.c:434
+#: src/gtkconn.c:440
 msgid "Time"
 msgstr "时间"
 
-#: src/gtkconv.c:309
+#: src/gtkconv.c:330
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我正在使用 Gaim v%s。"
 
-#: src/gtkconv.c:318
+#: src/gtkconv.c:339
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: src/gtkconv.c:342
+#: src/gtkconv.c:363
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: src/gtkconv.c:345
+#: src/gtkconv.c:366
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2482,354 +2586,354 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: src/gtkconv.c:417
+#: src/gtkconv.c:438
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: src/gtkconv.c:424
+#: src/gtkconv.c:445
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: src/gtkconv.c:429
+#: src/gtkconv.c:450
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: src/gtkconv.c:436
-msgid "That command only works in Chats, not IMs."
-msgstr "命令只在聊天中可用,对话中无效。"
-
-#: src/gtkconv.c:439
-msgid "That command only works in IMs, not Chats."
-msgstr "命令只在对话中可用,聊天中无效。"
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:457
+msgid "That command only works in chats, not IMs."
+msgstr "该命令只在聊天中可用,对话中无效。"
+
+#: src/gtkconv.c:460
+msgid "That command only works in IMs, not chats."
+msgstr "该命令只在对话中可用,聊天中无效。"
+
+#: src/gtkconv.c:464
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: src/gtkconv.c:671 src/gtkconv.c:697
-msgid "That buddy is not on the same protocol as this chat"
-msgstr "该好友不在此聊天的协议中"
-
-#: src/gtkconv.c:691
+#: src/gtkconv.c:692 src/gtkconv.c:718
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "该好友不在此聊天的协议中。"
+
+#: src/gtkconv.c:712
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: src/gtkconv.c:745
+#: src/gtkconv.c:767
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:775
+#: src/gtkconv.c:797
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:796
+#: src/gtkconv.c:818
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:816 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:838 src/gtksavedstatuses.c:774
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:872 src/gtkconv.c:2521 src/gtkdebug.c:177
+#: src/gtkconv.c:895 src/gtkconv.c:2542 src/gtkdebug.c:177
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: src/gtkconv.c:877
+#: src/gtkconv.c:901
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: src/gtkconv.c:891
+#: src/gtkconv.c:925
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: src/gtkconv.c:976 src/gtkdebug.c:126
+#: src/gtkconv.c:1026 src/gtkdebug.c:126
 msgid "Find"
 msgstr "查找"
 
-#: src/gtkconv.c:1002 src/gtkdebug.c:154
+#: src/gtkconv.c:1052 src/gtkdebug.c:154
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: src/gtkconv.c:1414
+#: src/gtkconv.c:1465
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkconv.c:1420 src/protocols/oscar/oscar.c:612
+#: src/gtkconv.c:1471 src/protocols/oscar/oscar.c:610
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/gtkconv.c:1427
+#: src/gtkconv.c:1478
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:1430 src/gtkprefs.c:762
+#: src/gtkconv.c:1481 src/gtkprefs.c:828
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/gtkconv.c:1435
+#: src/gtkconv.c:1486
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:1441
+#: src/gtkconv.c:1492
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: src/gtkconv.c:1450 src/gtkrequest.c:265
+#: src/gtkconv.c:1501 src/gtkrequest.c:266
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:2529
+#: src/gtkconv.c:2550
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: src/gtkconv.c:2550
+#: src/gtkconv.c:2573
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: src/gtkconv.c:2580
+#: src/gtkconv.c:2601
 msgid "Animate"
 msgstr "动画"
 
-#: src/gtkconv.c:2585
+#: src/gtkconv.c:2606
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:2591
+#: src/gtkconv.c:2612
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkconv.c:2950
+#: src/gtkconv.c:2977
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:2982
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3056
+#: src/gtkconv.c:3083
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3538
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3540
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: src/gtkconv.c:3517
+#: src/gtkconv.c:3545
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3547
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: src/gtkconv.c:3520
+#: src/gtkconv.c:3548
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:3522
+#: src/gtkconv.c:3550
 msgid "/Conversation/Clear"
 msgstr "/对话(C)/清除"
 
-#: src/gtkconv.c:3526
+#: src/gtkconv.c:3554
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: src/gtkconv.c:3527
+#: src/gtkconv.c:3555
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3557
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: src/gtkconv.c:3531
+#: src/gtkconv.c:3559
 msgid "/Conversation/_Warn..."
 msgstr "/对话(C)/警告(_W)..."
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3561
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: src/gtkconv.c:3538
+#: src/gtkconv.c:3566
 msgid "/Conversation/A_lias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: src/gtkconv.c:3540
+#: src/gtkconv.c:3568
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3570
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3572
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: src/gtkconv.c:3549
+#: src/gtkconv.c:3577
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/对话(C)/插入链接(_K)..."
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3579
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/对话(C)/插入图像(_E)..."
 
-#: src/gtkconv.c:3556
+#: src/gtkconv.c:3584
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:3560
+#: src/gtkconv.c:3588
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3589
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:3562
+#: src/gtkconv.c:3590
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:3563
+#: src/gtkconv.c:3591
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3592
 msgid "/Options/Show T_imestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3593
 msgid "/Options/Show Buddy _Icon"
 msgstr "/选项(O)/显示好友图标(_I)"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3637
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3643
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: src/gtkconv.c:3618
+#: src/gtkconv.c:3647
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3653
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3657
 msgid "/Conversation/Warn..."
 msgstr "/对话(C)/警告(W)..."
 
-#: src/gtkconv.c:3632
+#: src/gtkconv.c:3661
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3667
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: src/gtkconv.c:3642
+#: src/gtkconv.c:3671
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: src/gtkconv.c:3646
+#: src/gtkconv.c:3675
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3679
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3685
 msgid "/Conversation/Insert Link..."
 msgstr "/对话(C)/插入链接(K)..."
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3689
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:3666
+#: src/gtkconv.c:3695
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3698
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3701
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:3704
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: src/gtkconv.c:3678
+#: src/gtkconv.c:3707
 msgid "/Options/Show Buddy Icon"
 msgstr "/选项(O)/显示好友图标(I)"
 
-#: src/gtkconv.c:3793
+#: src/gtkconv.c:3821
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3841
+#: src/gtkconv.c:3869
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3903
+#: src/gtkconv.c:3931
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3916
+#: src/gtkconv.c:3944
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3928
+#: src/gtkconv.c:3956
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
-#: src/gtkconv.c:4429
+#: src/gtkconv.c:4489
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4931 src/gtkconv.c:4960 src/gtkconv.c:5056 src/gtkconv.c:5114
+#: src/gtkconv.c:5090 src/gtkconv.c:5118 src/gtkconv.c:5214 src/gtkconv.c:5271
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:6023
+#: src/gtkconv.c:6181
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: src/gtkconv.c:6026
+#: src/gtkconv.c:6184
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: src/gtkconv.c:6029
+#: src/gtkconv.c:6187
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: src/gtkconv.c:6033
+#: src/gtkconv.c:6191
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
@@ -2849,13 +2953,13 @@
 msgid "Timestamps"
 msgstr "时间戳"
 
-#: src/gtkdialogs.c:66
+#: src/gtkdialogs.c:66 src/gtkdialogs.c:95
 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:76 src/gtkdialogs.c:77
 msgid "developer"
 msgstr "开发者"
 
@@ -2871,25 +2975,17 @@
 msgid "support"
 msgstr "支持"
 
-#: src/gtkdialogs.c:93
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:96
 msgid "maintainer"
 msgstr "维护者"
 
 #: src/gtkdialogs.c:94
-msgid "former libfaim maintainer"
-msgstr "先前 libfaim 维护者"
-
-#: src/gtkdialogs.c:95
-msgid "former lead developer"
-msgstr "先前领导开发者"
-
-#: src/gtkdialogs.c:96
-msgid "former maintainer"
-msgstr "先前维护者"
+msgid "libfaim maintainer"
+msgstr "libfaim 维护者"
 
 #: src/gtkdialogs.c:97
-msgid "former Jabber developer"
-msgstr "先前 Jabber 开发者"
+msgid "Jabber developer"
+msgstr "Jabber 开发者"
 
 #: src/gtkdialogs.c:98
 msgid "original author"
@@ -2899,234 +2995,240 @@
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:142
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:105 src/gtkdialogs.c:147
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:143 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:148 src/gtkdialogs.c:149
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:145
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:150
 msgid "Czech"
 msgstr "捷克语"
 
-#: src/gtkdialogs.c:107
-msgid "Danish"
-msgstr "丹麦语"
-
 #: src/gtkdialogs.c:108
-msgid "Australian English"
-msgstr "澳大利亚英语"
-
-#: src/gtkdialogs.c:109
-msgid "British English"
-msgstr "英国英语"
+msgid "Danish"
+msgstr "丹麦语"
+
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:151
+msgid "German"
+msgstr "德语"
 
 #: src/gtkdialogs.c:110
+msgid "Australian English"
+msgstr "澳大利亚英语"
+
+#: src/gtkdialogs.c:111
+msgid "British English"
+msgstr "英国英语"
+
+#: src/gtkdialogs.c:112
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:146
-msgid "German"
-msgstr "德语"
-
-#: src/gtkdialogs.c:112 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:152
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:153
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:154
 msgid "French"
 msgstr "法语"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:116
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: src/gtkdialogs.c:116
-msgid "Hindi"
-msgstr "印地语"
-
 #: src/gtkdialogs.c:117
+msgid "Hindi"
+msgstr "印地语"
+
+#: src/gtkdialogs.c:118
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:155
 msgid "Italian"
 msgstr "意大利语"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:120 src/gtkdialogs.c:156
 msgid "Japanese"
 msgstr "日语"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:121
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:152
-msgid "Korean"
-msgstr "朝鲜语"
-
 #: src/gtkdialogs.c:122
-msgid "Dutch; Flemish"
-msgstr "荷兰语"
-
-#: src/gtkdialogs.c:123
-msgid "Macedonian"
-msgstr "马其顿语"
+#, fuzzy
+msgid "Georgian"
+msgstr "德语"
+
+#: src/gtkdialogs.c:123 src/gtkdialogs.c:157
+msgid "Korean"
+msgstr "朝鲜语"
 
 #: src/gtkdialogs.c:124
+#, fuzzy
+msgid "Dutch, Flemish"
+msgstr "荷兰语"
+
+#: src/gtkdialogs.c:125
+msgid "Macedonian"
+msgstr "马其顿语"
+
+#: src/gtkdialogs.c:126
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: src/gtkdialogs.c:125 src/gtkdialogs.c:153
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:128 src/gtkdialogs.c:158
 msgid "Polish"
 msgstr "波兰语"
 
-#: src/gtkdialogs.c:126
+#: src/gtkdialogs.c:129
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: src/gtkdialogs.c:127
+#: src/gtkdialogs.c:130
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: src/gtkdialogs.c:128
+#: src/gtkdialogs.c:131
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:154 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:132 src/gtkdialogs.c:159 src/gtkdialogs.c:160
 msgid "Russian"
 msgstr "俄语"
 
-#: src/gtkdialogs.c:130
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:134
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:135
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:136 src/gtkdialogs.c:162
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:137
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/gtkdialogs.c:133
+#: src/gtkdialogs.c:137
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: src/gtkdialogs.c:134
+#: src/gtkdialogs.c:138 src/gtkdialogs.c:163
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: src/gtkdialogs.c:135
+#: src/gtkdialogs.c:139 src/gtkdialogs.c:140 src/gtkdialogs.c:164
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: src/gtkdialogs.c:141
+#: src/gtkdialogs.c:146
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: src/gtkdialogs.c:156
+#: src/gtkdialogs.c:161
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: src/gtkdialogs.c:158
-msgid "Chinese"
-msgstr "中文"
-
-#: src/gtkdialogs.c:199
+#: src/gtkdialogs.c:205
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/gtkdialogs.c:223
+#: src/gtkdialogs.c:229
 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 "
-"at once.  It is written using GTK+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim 是模块化的即时通讯客户程序,同时支持 AIM、MSN、Yahoo!、Jabber、ICQ、"
 "IRC、SILC、Novell GroupWise、Napster、Zephyr 和 Gadu-Gadu。本程序用 GTK+ 写"
-"成,并以 GPL 许可协议发行。<BR><BR>"
-
-#: src/gtkdialogs.c:232
+"成,并以 GNU GPL 许可协议发行。<BR><BR>"
+
+#: src/gtkdialogs.c:238
 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
+#: 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:241
+#: src/gtkdialogs.c:247
 msgid "Active Developers"
 msgstr "当前开发者"
 
-#: src/gtkdialogs.c:256
+#: src/gtkdialogs.c:262
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: src/gtkdialogs.c:271
+#: src/gtkdialogs.c:277
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: src/gtkdialogs.c:286
+#: src/gtkdialogs.c:292
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: src/gtkdialogs.c:306
+#: src/gtkdialogs.c:312
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: src/gtkdialogs.c:455 src/gtkdialogs.c:597 src/gtkdialogs.c:651
+#: src/gtkdialogs.c:330
+msgid "Debugging Information"
+msgstr "调试信息"
+
+#: src/gtkdialogs.c:498 src/gtkdialogs.c:641 src/gtkdialogs.c:696
 msgid "_Name"
 msgstr "名称(_N)"
 
-#: src/gtkdialogs.c:460 src/gtkdialogs.c:602 src/gtkdialogs.c:656
+#: src/gtkdialogs.c:503 src/gtkdialogs.c:646 src/gtkdialogs.c:701
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: src/gtkdialogs.c:467
+#: src/gtkdialogs.c:511
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: src/gtkdialogs.c:469
+#: src/gtkdialogs.c:513
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:609
+#: src/gtkdialogs.c:654
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/gtkdialogs.c:611
+#: src/gtkdialogs.c:656
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:664
+#: src/gtkdialogs.c:710
 msgid "Get User Log"
 msgstr "获取用户日志"
 
-#: src/gtkdialogs.c:666
+#: src/gtkdialogs.c:712
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
 
-#: src/gtkdialogs.c:706
+#: src/gtkdialogs.c:752
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/gtkdialogs.c:727
+#: src/gtkdialogs.c:773
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3138,45 +3240,45 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/gtkdialogs.c:736
+#: src/gtkdialogs.c:782
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/gtkdialogs.c:743
+#: src/gtkdialogs.c:789
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/gtkdialogs.c:764
+#: src/gtkdialogs.c:810
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: src/gtkdialogs.c:765
+#: src/gtkdialogs.c:811
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: src/gtkdialogs.c:767 src/gtkdialogs.c:789 src/gtkdialogs.c:809
-#: src/gtkrequest.c:267 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:813 src/gtkdialogs.c:835 src/gtkdialogs.c:855
+#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "别名"
 
-#: src/gtkdialogs.c:785
+#: src/gtkdialogs.c:831
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: src/gtkdialogs.c:787
+#: src/gtkdialogs.c:833
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: src/gtkdialogs.c:806
+#: src/gtkdialogs.c:852
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: src/gtkdialogs.c:807
+#: src/gtkdialogs.c:853
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: src/gtkdialogs.c:844
+#: src/gtkdialogs.c:890
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3188,143 +3290,147 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: src/gtkdialogs.c:911
+#: src/gtkdialogs.c:957
 #, 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:914 src/gtkdialogs.c:915
+#: src/gtkdialogs.c:960 src/gtkdialogs.c:961
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/gtkdialogs.c:953
+#: src/gtkdialogs.c:999
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/gtkdialogs.c:956 src/gtkdialogs.c:957
+#: src/gtkdialogs.c:1002 src/gtkdialogs.c:1003
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/gtkdialogs.c:990
+#: src/gtkdialogs.c:1041
 #, 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:994 src/gtkdialogs.c:995
+#: src/gtkdialogs.c:1044 src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/gtkft.c:140
+#: src/gtkft.c:141
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:161 src/gtkft.c:966
+#: src/gtkft.c:162 src/gtkft.c:1000
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:164 src/gtkft.c:917
+#: src/gtkft.c:165 src/gtkft.c:951
 msgid "Canceled"
 msgstr "已取消"
 
-#: src/gtkft.c:167 src/gtkft.c:836
+#: src/gtkft.c:168 src/gtkft.c:870
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>接收为:</b>"
 
-#: src/gtkft.c:222
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:226
+#: src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:228
+#: src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>发送为:</b>"
 
-#: src/gtkft.c:407
+#: src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: src/gtkft.c:412
+#: src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:533
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:540
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:517
+#: src/gtkft.c:547
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:524
+#: src/gtkft.c:554
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:555
+#: src/gtkft.c:585
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:556
+#: src/gtkft.c:586
+msgid "Local File:"
+msgstr "本地文件:"
+
+#: src/gtkft.c:587
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:557
+#: src/gtkft.c:588
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:558
+#: src/gtkft.c:589
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:559
+#: src/gtkft.c:590
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:645
+#: src/gtkft.c:676
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:655
+#: src/gtkft.c:686
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:664
+#: src/gtkft.c:695
 msgid "Show transfer details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:665
+#: src/gtkft.c:696
 msgid "Hide transfer details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:702 src/gtkstock.c:105
+#: src/gtkft.c:733 src/gtkstock.c:105
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:712
+#: src/gtkft.c:743
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:919
+#: src/gtkft.c:953
 msgid "Failed"
 msgstr "已失败"
 
@@ -3336,46 +3442,54 @@
 msgid "Size of the expander arrow"
 msgstr "扩展箭头的大小"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:793
 msgid "Pa_ste As Text"
 msgstr "粘贴为文本(_S)"
 
-#: src/gtkimhtml.c:1023
+#: src/gtkimhtml.c:1235
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: src/gtkimhtml.c:1024
+#: src/gtkimhtml.c:1236
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: src/gtkimhtml.c:1238
+#: src/gtkimhtml.c:1239
+msgid "Hyperlink prelight color"
+msgstr "超级链接悬停颜色"
+
+#: src/gtkimhtml.c:1240
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "绘制超级链接悬停时的颜色。"
+
+#: src/gtkimhtml.c:1458
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: src/gtkimhtml.c:1250
+#: src/gtkimhtml.c:1470
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
+
+#: src/gtkimhtml.c:1480
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:1260
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
-#: src/gtkimhtml.c:2847
+#: src/gtkimhtml.c:3120
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:2855
+#: src/gtkimhtml.c:3128
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错: %s"
 
-#: src/gtkimhtml.c:2932 src/gtkimhtml.c:2944
+#: src/gtkimhtml.c:3205 src/gtkimhtml.c:3217
 msgid "Save Image"
 msgstr "保存图像"
 
-#: src/gtkimhtml.c:2972
+#: src/gtkimhtml.c:3245
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
@@ -3387,95 +3501,91 @@
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/gtkimhtmltoolbar.c:334
+#: src/gtkimhtmltoolbar.c:337
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:421
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:426
+#: src/gtkimhtmltoolbar.c:429
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:429
+#: src/gtkimhtmltoolbar.c:432
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: src/gtkimhtmltoolbar.c:433
+#: src/gtkimhtmltoolbar.c:436
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: src/gtkimhtmltoolbar.c:438
+#: src/gtkimhtmltoolbar.c:441
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:442
+#: src/gtkimhtmltoolbar.c:445
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:511
+#: src/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败: %s\n"
 
-#: src/gtkimhtmltoolbar.c:537 src/gtkimhtmltoolbar.c:547
+#: src/gtkimhtmltoolbar.c:540 src/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:706 src/gtkimhtmltoolbar.c:784
+#: src/gtkimhtmltoolbar.c:748
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的笑脸。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:798
+#: src/gtkimhtmltoolbar.c:762
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/gtkimhtmltoolbar.c:977
+#: src/gtkimhtmltoolbar.c:940
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkimhtmltoolbar.c:988
+#: src/gtkimhtmltoolbar.c:951
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkimhtmltoolbar.c:999
+#: src/gtkimhtmltoolbar.c:962
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:978
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkimhtmltoolbar.c:1027
+#: src/gtkimhtmltoolbar.c:990
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkimhtmltoolbar.c:1044
+#: src/gtkimhtmltoolbar.c:1007
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkimhtmltoolbar.c:1056
+#: src/gtkimhtmltoolbar.c:1019
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkimhtmltoolbar.c:1068
-msgid "Background color"
-msgstr "背景颜色"
-
-#: src/gtkimhtmltoolbar.c:1083
+#: src/gtkimhtmltoolbar.c:1046
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkimhtmltoolbar.c:1093
+#: src/gtkimhtmltoolbar.c:1056
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkimhtmltoolbar.c:1104
+#: src/gtkimhtmltoolbar.c:1067
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
@@ -3494,7 +3604,8 @@
 "System events will only be logged if the <span style=\"italic\">Enable "
 "system log preference</span> is set."
 msgstr ""
-"仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日志。"
+"仅当选择了<span style=\"italic\">启用系统日志</span>首选项时才会记录系统日"
+"志。"
 
 #: src/gtklog.c:400
 msgid ""
@@ -3559,37 +3670,24 @@
 "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: src/gtkmain.c:633
-msgid "Unable to load preferences"
-msgstr "无法装入首选项"
-
-#: src/gtkmain.c:634
-msgid ""
-"Gaim was not able to load your preferences because they are stored in an old "
-"format that is no longer used.  Please reconfigure your settings using the "
-"Preferences window."
-msgstr ""
-"Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。请使"
-"用首选项窗口重新配置您的设置。"
-
 #. Descriptive label
-#: src/gtknotify.c:262
+#: src/gtknotify.c:267
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:276
+#: src/gtknotify.c:281
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:285
+#: src/gtknotify.c:290
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: src/gtknotify.c:295
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3600,7 +3698,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:306
+#: src/gtknotify.c:311
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3611,26 +3709,26 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:446
+#: src/gtknotify.c:456
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: src/gtknotify.c:601
+#: src/gtknotify.c:617
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "浏览器命令 <b>%s</b> 无效。"
 
-#: src/gtknotify.c:603 src/gtknotify.c:615 src/gtknotify.c:628
-#: src/gtknotify.c:752
+#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
+#: src/gtknotify.c:768
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: src/gtknotify.c:613 src/gtknotify.c:626
+#: src/gtknotify.c:629 src/gtknotify.c:642
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "调用 <b>%s</b> 出错: %s"
 
-#: src/gtknotify.c:753
+#: src/gtknotify.c:769
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
@@ -3744,270 +3842,270 @@
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 睡醒了(%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 打起瞌睡(%s)"
 
-#: src/gtkpounce.c:981
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: src/gtkpounce.c:982
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: src/gtkprefs.c:615
+#: src/gtkprefs.c:679
 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:655
+#: src/gtkprefs.c:719
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:662 src/gtkprefs.c:2051 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:804 src/protocols/jabber/chat.c:766
+#: src/gtkprefs.c:726 src/gtkprefs.c:2057 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:757
+#: src/gtkprefs.c:823
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:759
+#: src/gtkprefs.c:825
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:829
 msgid "Ignore _formatting"
 msgstr "忽略格式(_F)"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:832
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: src/gtkprefs.c:768
+#: src/gtkprefs.c:834
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出信息使用默认格式(_S)"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:844
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:847
 msgid "_Clear Formatting"
 msgstr "清除格式(_C)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:889
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:898
 msgid "_Sorting:"
 msgstr "排序(_S):"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:903
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:904
 msgid "Show more buddy details"
 msgstr "显示好友的更多细节"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:939
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "将未知的斜线命令发送为消息(_S)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:942
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:944
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:946
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
 #. All the tab options!
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:950
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:952
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:966
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:969
 msgid "Tab p_lacement:"
 msgstr "标签位置(_L):"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:971
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:972
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:973
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:974
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:980
 msgid "New conversation _placement:"
 msgstr "新对话放置(_P):"
 
-#: src/gtkprefs.c:961 src/protocols/oscar/oscar.c:765
-#: src/protocols/oscar/oscar.c:5203
+#: src/gtkprefs.c:1033 src/protocols/oscar/oscar.c:763
+#: src/protocols/oscar/oscar.c:5180
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:1035
 msgid "_Autodetect IP Address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:1044
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1068
 msgid "Ports"
 msgstr "端口"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1071
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:1074
 msgid "_Start Port:"
 msgstr "起始端口(_S):"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1081
 msgid "_End Port:"
 msgstr "终止端口(_E):"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1088
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1092
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1082
+#: src/gtkprefs.c:1154
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1210
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1139
+#: src/gtkprefs.c:1211
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1140
+#: src/gtkprefs.c:1212
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1141
+#: src/gtkprefs.c:1213
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1142
+#: src/gtkprefs.c:1214
 msgid "Gnome Default"
 msgstr "GNOME 默认"
 
-#: src/gtkprefs.c:1143
+#: src/gtkprefs.c:1215
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1144
+#: src/gtkprefs.c:1216
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1145
+#: src/gtkprefs.c:1217
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1146
+#: src/gtkprefs.c:1218
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1227
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1280
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1284
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1291
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: src/gtkprefs.c:1219
+#: src/gtkprefs.c:1293
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1294
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1296
 msgid "New tab"
 msgstr "新建标签"
 
-#: src/gtkprefs.c:1236
+#: src/gtkprefs.c:1310
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4016,75 +4114,75 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: src/gtkprefs.c:1273
+#: src/gtkprefs.c:1349
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1352
 msgid "Log _Format:"
 msgstr "日志格式(_F):"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1355
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1281
+#: src/gtkprefs.c:1357
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1284
+#: src/gtkprefs.c:1360
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/gtkprefs.c:1286
+#: src/gtkprefs.c:1362
 msgid "_Enable system log"
 msgstr "启用系统日志(_E)"
 
-#: src/gtkprefs.c:1289
+#: src/gtkprefs.c:1365
 msgid "Log when buddies log in/log _out"
 msgstr "记录好友的登入/登出(_O)"
 
-#: src/gtkprefs.c:1295
+#: src/gtkprefs.c:1371
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡/睡醒(_I)"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1377
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1383
 msgid "Log your own _signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_S)"
 
-#: src/gtkprefs.c:1443
+#: src/gtkprefs.c:1520
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:1495
+#: src/gtkprefs.c:1574
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1575
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1577
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1579
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1507
+#: src/gtkprefs.c:1586
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1508
+#: src/gtkprefs.c:1587
 msgid "No sounds"
 msgstr "无声音"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1595
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4093,102 +4191,102 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1543
+#: src/gtkprefs.c:1622
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1544
+#: src/gtkprefs.c:1623
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1625
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1556
+#: src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:1607
+#: src/gtkprefs.c:1686
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1614
+#: src/gtkprefs.c:1693
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1712
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkprefs.c:1637
+#: src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:1695
+#: src/gtkprefs.c:1776
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1698
+#: src/gtkprefs.c:1779
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: src/gtkprefs.c:1700
+#: src/gtkprefs.c:1781
 msgid "Never"
 msgstr "从不"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1782
 msgid "When away"
 msgstr "离开时"
 
-#: src/gtkprefs.c:1702
-msgid "if (away && idle)"
-msgstr "如果离开且瞌睡"
-
-#: src/gtkprefs.c:1705 src/protocols/msn/msn.c:504
+#: src/gtkprefs.c:1783
+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:4323 src/protocols/yahoo/yahoo.c:2442
+#: src/protocols/oscar/oscar.c:4310 src/protocols/yahoo/yahoo.c:2537
 #: src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "瞌睡"
 
-#: src/gtkprefs.c:1706
+#: src/gtkprefs.c:1787
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1709
+#: src/gtkprefs.c:1790
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1712
+#: src/gtkprefs.c:1793
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1714
+#: src/gtkprefs.c:1795
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1722
+#: src/gtkprefs.c:1803
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1723
+#: src/gtkprefs.c:1804
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1727
+#: src/gtkprefs.c:1808
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1735
+#: src/gtkprefs.c:1816
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1793
+#: src/gtkprefs.c:1874
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4203,7 +4301,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1879
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4218,47 +4316,47 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:2007
+#: src/gtkprefs.c:2013
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:2021
+#: src/gtkprefs.c:2027
 msgid "Summary"
 msgstr "概览"
 
-#: src/gtkprefs.c:2069
+#: src/gtkprefs.c:2075
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:2113
+#: src/gtkprefs.c:2118
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2114
+#: src/gtkprefs.c:2119
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2115
+#: src/gtkprefs.c:2120
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2116
+#: src/gtkprefs.c:2121 src/protocols/silc/silc.c:1599
 msgid "Network"
 msgstr "网络"
 
-#: src/gtkprefs.c:2121
+#: src/gtkprefs.c:2126
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2124
+#: src/gtkprefs.c:2129
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2125
+#: src/gtkprefs.c:2130
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2128
+#: src/gtkprefs.c:2133
 msgid "Plugins"
 msgstr "插件"
 
@@ -4282,67 +4380,67 @@
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: src/gtkprivacy.c:388
+#: src/gtkprivacy.c:392
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:405
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:417
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:583 src/gtkprivacy.c:599
 msgid "Permit User"
 msgstr "允许用户"
 
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:584
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:585
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:588 src/gtkprivacy.c:601
 msgid "Permit"
 msgstr "允许"
 
-#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:595
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
+#: src/gtkprivacy.c:622 src/gtkprivacy.c:635
 msgid "Block User"
 msgstr "屏蔽用户"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:623
 msgid "Type a user to block."
 msgstr "输入要屏蔽的用户。"
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:624
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:626 src/gtkprivacy.c:637
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkprivacy.c:627
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:633
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
@@ -4350,44 +4448,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1026
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:511
-#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1901
+#: 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/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
 #: src/request.h:1235
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1026
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:511
-#: src/protocols/msn/msn.c:514 src/protocols/novell/novell.c:1902
+#: 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/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
 #: src/request.h:1235
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:261
+#: src/gtkrequest.c:262
 msgid "Apply"
 msgstr "应用"
 
-#: src/gtkrequest.c:262 src/protocols/msn/msn.c:314
-#: src/protocols/silc/util.c:332
+#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "关闭"
 
-#: src/gtkrequest.c:1629
+#: src/gtkrequest.c:1707
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: src/gtkrequest.c:1630
+#: src/gtkrequest.c:1708
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkrequest.c:1672 src/gtkrequest.c:1713
+#: src/gtkrequest.c:1750 src/gtkrequest.c:1791
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: src/gtkrequest.c:1673 src/gtkrequest.c:1714
+#: src/gtkrequest.c:1751 src/gtkrequest.c:1792
 msgid "Open File..."
 msgstr "打开文件..."
 
@@ -4401,7 +4499,7 @@
 msgstr "获取列表(_G)"
 
 #: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:798 src/protocols/novell/novell.c:1460
+#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "标题"
 
@@ -4409,17 +4507,21 @@
 msgid "Type"
 msgstr "类型"
 
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:292
-#: src/protocols/gg/gg.c:298 src/protocols/gg/gg.c:304
-#: src/protocols/gg/gg.c:310 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/irc/irc.c:180 src/protocols/jabber/jabber.c:971
-#: 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/novell/novell.c:2831 src/protocols/oscar/oscar.c:7041
-#: src/protocols/oscar/oscar.c:7048 src/protocols/yahoo/yahoo.c:2926
-#: src/protocols/yahoo/yahoo.c:2960 src/protocols/zephyr/zephyr.c:2226
+#: 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
 msgid "Message"
 msgstr "消息"
 
@@ -4435,12 +4537,12 @@
 msgid "Custom status"
 msgstr "自定义状态"
 
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:619
-#: src/protocols/jabber/buddy.c:626 src/protocols/jabber/buddy.c:637
-#: src/protocols/jabber/jabber.c:950 src/protocols/msn/msn.c:502
+#: 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:747 src/protocols/oscar/oscar.c:753
-#: src/protocols/oscar/oscar.c:755 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/oscar/oscar.c:745 src/protocols/oscar/oscar.c:751
+#: src/protocols/oscar/oscar.c:753 src/protocols/yahoo/yahoo.c:2660
 msgid "Status"
 msgstr "状态"
 
@@ -4519,44 +4621,48 @@
 "launched: %s"
 msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
 
-#: src/gtkstatusbox.c:133
+#: src/gtkstatusbox.c:132
 msgid "Typing"
 msgstr "正打字"
 
 #. connect to the server
-#: src/gtkstatusbox.c:138 src/protocols/irc/irc.c:259
-#: src/protocols/jabber/jabber.c:801 src/protocols/msn/session.c:359
-#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
-#: src/protocols/oscar/oscar.c:1818 src/protocols/trepia/trepia.c:1068
-#: src/protocols/yahoo/yahoo.c:2262 src/protocols/zephyr/zephyr.c:1492
+#: 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
 msgid "Connecting"
 msgstr "正连接"
 
 #. hacks
-#: src/gtkstatusbox.c:247 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:175
-#: src/protocols/jabber/jabber.c:982 src/protocols/msn/msn.c:535
+#: 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/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:2927
-#: src/protocols/novell/novell.c:2978 src/protocols/oscar/oscar.c:787
-#: src/protocols/oscar/oscar.c:7040 src/protocols/yahoo/yahoo.c:2920
-#: src/status.c:157
+#: 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
 msgid "Available"
 msgstr "可用"
 
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:695 src/protocols/oscar/oscar.c:7054
-#: src/protocols/yahoo/yahoo.c:2440 src/protocols/yahoo/yahoo.c:2964
+#: 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
 msgid "Invisible"
 msgstr "隐身"
 
-#: src/gtkstatusbox.c:250 src/protocols/gg/gg.c:282
-#: src/protocols/irc/irc.c:167 src/protocols/jabber/buddy.c:1074
-#: src/protocols/jabber/jabber.c:971 src/protocols/msn/msn.c:527
-#: src/protocols/napster/napster.c:556 src/protocols/novell/novell.c:2820
-#: src/protocols/oscar/oscar.c:755 src/protocols/oscar/oscar.c:6836
-#: src/protocols/oscar/oscar.c:7030 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2444 src/protocols/yahoo/yahoo.c:2914
+#: 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
 msgid "Offline"
 msgstr "离线"
@@ -4635,10 +4741,10 @@
 
 #: src/gtkutils.c:1528
 msgid ""
-"You can send this image as a file transfer orembed it into this message, or "
+"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
 msgid ""
@@ -4667,11 +4773,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: src/log.c:545
+#: src/log.c:538
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:607
+#: src/log.c:600
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4680,7 +4786,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:609
+#: src/log.c:602
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4689,40 +4795,40 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:660 src/log.c:790
+#: src/log.c:653 src/log.c:783
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: src/log.c:670 src/log.c:802
+#: src/log.c:663 src/log.c:795
 #, 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:674
+#: src/log.c:667
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:735
+#: src/log.c:728
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#: src/log.c:806
+#: src/log.c:799
 msgid "Plain text"
 msgstr "纯文本"
 
-#: src/plugin.c:320
+#: src/plugin.c:324
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
-#: src/plugin.c:325 src/plugin.c:353
+#: src/plugin.c:329 src/plugin.c:357
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
-#: src/plugin.c:349
+#: src/plugin.c:353
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "所需插件 %s 无法装入。"
@@ -4731,67 +4837,68 @@
 msgid "Slightly less boring default"
 msgstr "烦死我了"
 
-#: src/protocols/gg/gg.c:51
+#: src/protocols/gg/gg.c:52
 msgid "Available for friends only"
 msgstr "只对好友可用"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:54
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:56
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:56 src/status.c:158
+#: src/protocols/gg/gg.c:57 src/status.c:158
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:152
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:155 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
+#: src/protocols/gg/gg.c:158 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:108
+#: src/protocols/jabber/jabber.c:109
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:161
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:164
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:167
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:170
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:247 src/protocols/oscar/oscar.c:4122
+#: src/protocols/gg/gg.c:272 src/protocols/oscar/oscar.c:4109
 #, 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:248 src/protocols/gg/gg.c:1088
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4126
-#: src/protocols/oscar/oscar.c:4352 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#: 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/silc/ops.c:1151 src/protocols/toc/toc.c:470
+#: src/protocols/zephyr/zephyr.c:724 src/protocols/zephyr/zephyr.c:1139
 msgid "Buddy Information"
 msgstr "好友信息"
 
+#. TODO: Do we need both an "online" and an "available" state?
 #. zephyr has several exposures
 #. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
 #. OPSTAFF "hidden"
@@ -4805,172 +4912,173 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/protocols/gg/gg.c:286 src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:976
-#: src/protocols/msn/msn.c:531 src/protocols/napster/napster.c:561
-#: src/protocols/oscar/oscar.c:697 src/protocols/oscar/oscar.c:7035
-#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2446
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/zephyr/zephyr.c:2218
+#: 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
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/gg/gg.c:341
+#: src/protocols/gg/gg.c:366
 #, c-format
 msgid "Status: %s"
 msgstr "状态: %s"
 
-#: src/protocols/gg/gg.c:495
+#: src/protocols/gg/gg.c:520
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:502
+#: src/protocols/gg/gg.c:527
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:751 src/protocols/napster/napster.c:486
-#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2032 src/protocols/yahoo/yahoo.c:2059
-#: src/protocols/yahoo/yahoo.c:2122 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/gg/gg.c:819 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_filexfer.c:114 src/protocols/yahoo/ycht.c:483
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:767
+#: src/protocols/gg/gg.c:835
 msgid "Reading data"
 msgstr "读取数据"
 
-#: src/protocols/gg/gg.c:770
+#: src/protocols/gg/gg.c:838
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:773
+#: src/protocols/gg/gg.c:841
 msgid "Reading server key"
 msgstr "读取服务器密钥"
 
-#: src/protocols/gg/gg.c:776
+#: src/protocols/gg/gg.c:844
 msgid "Exchanging key hash"
 msgstr "交换密钥"
 
-#: src/protocols/gg/gg.c:786
+#: src/protocols/gg/gg.c:854
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:804 src/protocols/gg/gg.c:895
-#: src/protocols/toc/toc.c:147
+#: src/protocols/gg/gg.c:872 src/protocols/gg/gg.c:965
+#: src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:852
+#: src/protocols/gg/gg.c:922
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:864
+#: src/protocols/gg/gg.c:934
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:869
+#: src/protocols/gg/gg.c:939
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:872
+#: src/protocols/gg/gg.c:942
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:919
+#: src/protocols/gg/gg.c:988
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:1041
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:999
+#: src/protocols/gg/gg.c:1046
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:1025
+#: src/protocols/gg/gg.c:1072 src/protocols/sametime/sametime.c:2711
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:1030 src/protocols/oscar/oscar.c:5195
+#: src/protocols/gg/gg.c:1077 src/protocols/oscar/oscar.c:5172
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1034 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:5206 src/protocols/silc/ops.c:810
+#: 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/trepia/trepia.c:268
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1039 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:5207 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1086 src/protocols/jabber/jabber.c:631
+#: src/protocols/oscar/oscar.c:5184 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:1043 src/protocols/gg/gg.c:1788
-#: src/protocols/irc/msgs.c:204 src/protocols/oscar/oscar.c:5196
+#: 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/silc/ops.c:1202
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:1050 src/protocols/gg/gg.c:1053
+#: src/protocols/gg/gg.c:1097 src/protocols/gg/gg.c:1100
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:1059 src/protocols/gg/gg.c:1061
-#: src/protocols/gg/gg.c:1063
+#: src/protocols/gg/gg.c:1106 src/protocols/gg/gg.c:1108
+#: src/protocols/gg/gg.c:1110
 msgid "Sex"
 msgstr "性别"
 
 #. City
-#: src/protocols/gg/gg.c:1067 src/protocols/jabber/jabber.c:637
-#: src/protocols/oscar/oscar.c:5250 src/protocols/oscar/oscar.c:5258
+#: 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/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:1110
+#: src/protocols/gg/gg.c:1157
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:1118
+#: src/protocols/gg/gg.c:1165
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1227
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:1188
+#: src/protocols/gg/gg.c:1235
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:1196
+#: src/protocols/gg/gg.c:1243
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:1204
+#: src/protocols/gg/gg.c:1251
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1213
+#: src/protocols/gg/gg.c:1260
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:1220
+#: src/protocols/gg/gg.c:1267
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:1339
+#: src/protocols/gg/gg.c:1386
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:1340
+#: 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."
@@ -4978,77 +5086,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:1369
+#: src/protocols/gg/gg.c:1416
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1370
+#: src/protocols/gg/gg.c:1417
 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:1443
+#: src/protocols/gg/gg.c:1490
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1444 src/protocols/gg/gg.c:1467
+#: src/protocols/gg/gg.c:1491 src/protocols/gg/gg.c:1514
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1466
+#: src/protocols/gg/gg.c:1513
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1517
+#: src/protocols/gg/gg.c:1564
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1518
+#: 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:1552
+#: src/protocols/gg/gg.c:1599
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1553
+#: src/protocols/gg/gg.c:1600
 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:1569
+#: src/protocols/gg/gg.c:1616
 msgid "Directory Search"
 msgstr "目录搜索"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1574 src/protocols/jabber/jabber.c:1111
-#: src/protocols/toc/toc.c:1577
+#: src/protocols/gg/gg.c:1621 src/protocols/jabber/jabber.c:1115
+#: src/protocols/toc/toc.c:1667
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1578
+#: src/protocols/gg/gg.c:1625
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1582
+#: src/protocols/gg/gg.c:1629
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1586
+#: src/protocols/gg/gg.c:1633
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1619
+#: src/protocols/gg/gg.c:1666
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1620
+#: src/protocols/gg/gg.c:1667
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5065,30 +5173,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1767 src/protocols/gg/gg.c:1769
+#: src/protocols/gg/gg.c:1814 src/protocols/gg/gg.c:1816
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1299
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:589
-#: src/protocols/silc/silc.c:1007
+#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1030
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
-#: src/protocols/irc/cmds.c:465 src/protocols/jabber/chat.c:593
-#: src/protocols/silc/silc.c:1011
+#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1034
 msgid "No topic is set"
 msgstr "未设定话题"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:170
-#: src/protocols/yahoo/yahoo_filexfer.c:180
-#: src/protocols/yahoo/yahoo_filexfer.c:189
-#: src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
+#: src/protocols/yahoo/yahoo_filexfer.c:185
+#: src/protocols/yahoo/yahoo_filexfer.c:194
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
@@ -5113,8 +5220,8 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: src/protocols/irc/irc.c:102 src/protocols/irc/irc.c:527
+#: src/protocols/irc/irc.c:549
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -5126,48 +5233,48 @@
 msgid "_Channel:"
 msgstr "频道(_C):"
 
-#: src/protocols/irc/irc.c:208 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:209 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#: src/protocols/irc/irc.c:240
+#: src/protocols/irc/irc.c:241
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#: src/protocols/irc/irc.c:267 src/protocols/jabber/jabber.c:407
-#: src/protocols/jabber/jabber.c:739
+#: src/protocols/irc/irc.c:269 src/protocols/jabber/jabber.c:408
+#: src/protocols/jabber/jabber.c:743
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-#: src/protocols/irc/irc.c:278
+#: src/protocols/irc/irc.c:280
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:346 src/protocols/jabber/jabber.c:302
-#: src/protocols/oscar/oscar.c:1737 src/protocols/oscar/oscar.c:1814
+#: src/protocols/irc/irc.c:351 src/protocols/jabber/jabber.c:303
+#: src/protocols/oscar/oscar.c:1735 src/protocols/oscar/oscar.c:1812
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/irc/irc.c:371 src/protocols/jabber/jabber.c:329
+#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:330
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: src/protocols/irc/irc.c:374 src/protocols/jabber/jabber.c:332
+#: src/protocols/irc/irc.c:379 src/protocols/jabber/jabber.c:333
 msgid "SSL Handshake Failed"
 msgstr "SSL 握手失败"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
-#: src/protocols/trepia/trepia.c:930
+#: src/protocols/irc/irc.c:524 src/protocols/irc/irc.c:546
+#: src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "读取错误"
 
-#: src/protocols/irc/irc.c:680 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1355
+#: src/protocols/irc/irc.c:685 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1382
 msgid "Users"
 msgstr "用户"
 
-#: src/protocols/irc/irc.c:683 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1364
+#: src/protocols/irc/irc.c:688 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1391
 msgid "Topic"
 msgstr "话题"
 
@@ -5179,254 +5286,257 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:790
+#: src/protocols/irc/irc.c:795
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: src/protocols/irc/irc.c:791
+#: src/protocols/irc/irc.c:796
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
-#: src/protocols/irc/irc.c:810 src/protocols/irc/msgs.c:224
-#: src/protocols/jabber/jabber.c:1607 src/protocols/napster/napster.c:691
+#: 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/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:813 src/protocols/jabber/jabber.c:1628
-#: src/protocols/msn/msn.c:1918 src/protocols/napster/napster.c:696
-#: src/protocols/silc/silc.c:1593 src/protocols/trepia/trepia.c:1304
+#: 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
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:816
+#: src/protocols/irc/irc.c:821
 msgid "Encodings"
 msgstr "编码"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:218
-#: src/protocols/jabber/jabber.c:597 src/protocols/silc/buddy.c:1459
+#: 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/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:822
+#: src/protocols/irc/irc.c:827
 msgid "Real name"
 msgstr "真名"
 
-#: src/protocols/irc/irc.c:825
+#: src/protocols/irc/irc.c:830
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: src/protocols/irc/msgs.c:97
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "无效模式"
 
-#: src/protocols/irc/msgs.c:108
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被 %s 屏蔽了。"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "屏蔽"
 
-#: src/protocols/irc/msgs.c:126
+#: src/protocols/irc/msgs.c:134
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "无法屏蔽 %s:屏蔽列表已满"
 
-#: src/protocols/irc/msgs.c:204 src/protocols/irc/msgs.c:224
-#: src/protocols/irc/msgs.c:237
+#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:208
+#: src/protocols/irc/msgs.c:218
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:212 src/protocols/irc/msgs.c:218
-#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:230
+#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
+#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
 #: src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:219 src/protocols/silc/ops.c:969
+#: 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
 msgid "Realname"
 msgstr "真名"
 
-#: src/protocols/irc/msgs.c:230 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "目前位于"
 
-#: src/protocols/irc/msgs.c:235
+#: src/protocols/irc/msgs.c:245
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>瞌睡了:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:237
+#: src/protocols/irc/msgs.c:247
 msgid "Online since"
 msgstr "上线时间"
 
-#: src/protocols/irc/msgs.c:240
+#: src/protocols/irc/msgs.c:250
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>定义形容词:</b>显赫<br>"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:257
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s 的好友信息"
 
-#: src/protocols/irc/msgs.c:310
+#: src/protocols/irc/msgs.c:320
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: src/protocols/irc/msgs.c:315
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: src/protocols/irc/msgs.c:332
+#: src/protocols/irc/msgs.c:342
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: src/protocols/irc/msgs.c:333
+#: src/protocols/irc/msgs.c:343
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: src/protocols/irc/msgs.c:333
+#: src/protocols/irc/msgs.c:343
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
 
-#: src/protocols/irc/msgs.c:356
+#: src/protocols/irc/msgs.c:366
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: src/protocols/irc/msgs.c:451
+#: src/protocols/irc/msgs.c:463
 msgid "Time Response"
 msgstr "时间响应"
 
-#: src/protocols/irc/msgs.c:452
+#: src/protocols/irc/msgs.c:464
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:475
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:475
+#: src/protocols/irc/msgs.c:486
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: src/protocols/irc/msgs.c:478
+#: src/protocols/irc/msgs.c:489
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: src/protocols/irc/msgs.c:484
+#: src/protocols/irc/msgs.c:494
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: src/protocols/irc/msgs.c:505
+#: src/protocols/irc/msgs.c:514
 msgid "Could not send"
 msgstr "无法发送"
 
-#: src/protocols/irc/msgs.c:561
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:571
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: src/protocols/irc/msgs.c:663
+#: src/protocols/irc/msgs.c:673
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
-#: src/protocols/irc/msgs.c:668
+#: src/protocols/irc/msgs.c:678
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: src/protocols/irc/msgs.c:689
+#: src/protocols/irc/msgs.c:702
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:772
+#: src/protocols/irc/msgs.c:786
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr ""
-"您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
-
-#: src/protocols/irc/msgs.c:812
+msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
+
+#: src/protocols/irc/msgs.c:825
+msgid "Cannot change nick"
+msgstr "无法更改昵称"
+
+#: src/protocols/irc/msgs.c:825
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: src/protocols/irc/msgs.c:813
-msgid "Cannot change nick"
-msgstr "无法更改昵称"
-
-#: src/protocols/irc/msgs.c:834
+#: src/protocols/irc/msgs.c:846
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: src/protocols/irc/msgs.c:875
+#: src/protocols/irc/msgs.c:888
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: src/protocols/irc/msgs.c:877
+#: src/protocols/irc/msgs.c:890
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: src/protocols/irc/msgs.c:952
+#: src/protocols/irc/msgs.c:965
 #, c-format
 msgid "Cannot join %s:"
 msgstr "无法加入 %s:"
 
-#: src/protocols/irc/msgs.c:953 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: src/protocols/irc/msgs.c:989
+#: src/protocols/irc/msgs.c:1000
+msgid "Nick or channel is temporarily unavailable."
+msgstr "昵称或频道暂时不可用。"
+
+#: src/protocols/irc/msgs.c:1012
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5435,13 +5545,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5449,7 +5559,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5457,135 +5567,135 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:122
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:123
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
 
-#: src/protocols/irc/parse.c:124
+#: src/protocols/irc/parse.c:125
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:126
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1459
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1463
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:133
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:134
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: src/protocols/irc/parse.c:134
+#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:136
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:137
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:138
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 
-#: src/protocols/irc/parse.c:421
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
-#: src/protocols/oscar/oscar.c:1634 src/protocols/toc/toc.c:189
-#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
-#: src/protocols/toc/toc.c:690
+#: 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/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "已断开连接。"
 
@@ -5622,656 +5732,657 @@
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
 #: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:673
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
 #: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:677
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/jabber.c:617 src/protocols/msn/msn.c:1340
-#: src/protocols/silc/buddy.c:1456 src/protocols/silc/ops.c:822
+#: 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/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
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:661
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:719
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:715
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:723
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:727
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:731
-#: src/protocols/jabber/jabber.c:647
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/jabber.c:651
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:747
-#: src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
+#: src/protocols/jabber/buddy.c:755
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:765
-#: src/protocols/jabber/buddy.c:773 src/protocols/silc/silc.c:651
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
+#: 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
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:788
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:792
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:801
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:694
-#: src/protocols/oscar/oscar.c:5231
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
+#: src/protocols/oscar/oscar.c:5208
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:563
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
 msgid "Edit Jabber vCard"
 msgstr "编辑 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:564
+#: src/protocols/jabber/buddy.c:565
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: src/protocols/jabber/buddy.c:609
+#: src/protocols/jabber/buddy.c:610
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:635 src/protocols/jabber/jabber.c:1610
+#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1614
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/buddy.c:681 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "中名"
 
-#: src/protocols/jabber/buddy.c:699 src/protocols/jabber/jabber.c:632
-#: src/protocols/oscar/oscar.c:5249 src/protocols/oscar/oscar.c:5257
+#: 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/silc/ops.c:850
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:711
+#: src/protocols/jabber/buddy.c:712
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: src/protocols/jabber/buddy.c:817
+#: src/protocols/jabber/buddy.c:822
 msgid "Photo"
 msgstr "相片"
 
-#: src/protocols/jabber/buddy.c:817
+#: src/protocols/jabber/buddy.c:822
 msgid "Logo"
 msgstr "图符"
 
-#: src/protocols/jabber/buddy.c:840
+#: src/protocols/jabber/buddy.c:847
 msgid "Jabber Profile"
 msgstr "Jabber 资料"
 
-#: src/protocols/jabber/buddy.c:1022
+#: src/protocols/jabber/buddy.c:1029
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/buddy.c:1025
+#: src/protocols/jabber/buddy.c:1032
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1032
+#: src/protocols/jabber/buddy.c:1039
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/buddy.c:1038
+#: src/protocols/jabber/buddy.c:1045
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1046
+#: src/protocols/jabber/buddy.c:1053
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/chat.c:674
-#: src/protocols/jabber/chat.c:685 src/protocols/jabber/jabber.c:958
+#: 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/silc/ops.c:1239
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:992
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/buddy.c:1082 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/buddy.c:1089 src/protocols/jabber/jabber.c:1004
 #: src/status.c:161
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/buddy.c:1084 src/protocols/jabber/jabber.c:1006
-#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:7074
+#: 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
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6555
-#: src/protocols/yahoo/yahoochat.c:958
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6461
+#: src/protocols/yahoo/yahoochat.c:984
 msgid "_Room:"
 msgstr "房间(_R):"
 
-#: src/protocols/jabber/chat.c:46
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: src/protocols/jabber/chat.c:220
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: src/protocols/jabber/chat.c:221
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: src/protocols/jabber/chat.c:226
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: src/protocols/jabber/chat.c:227 src/protocols/jabber/chat.c:228
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: src/protocols/jabber/chat.c:232
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: src/protocols/jabber/chat.c:233 src/protocols/jabber/chat.c:234
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: src/protocols/jabber/chat.c:392
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: src/protocols/jabber/chat.c:401 src/protocols/jabber/chat.c:546
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: src/protocols/jabber/chat.c:417
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: src/protocols/jabber/chat.c:418
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: src/protocols/jabber/chat.c:468 src/protocols/jabber/chat.c:537
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "注册错误"
 
-#: src/protocols/jabber/chat.c:625
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: src/protocols/jabber/chat.c:675 src/protocols/jabber/chat.c:686
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: src/protocols/jabber/chat.c:734
+#: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: src/protocols/jabber/chat.c:773
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: src/protocols/jabber/jabber.c:77
+#: src/protocols/jabber/jabber.c:78
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: src/protocols/jabber/jabber.c:211 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:700 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1035 src/protocols/trepia/trepia.c:1134
-#: src/protocols/trepia/trepia.c:1180
+#: src/protocols/jabber/jabber.c:212 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:249 src/protocols/jabber/jabber.c:269
+#: src/protocols/jabber/jabber.c:250 src/protocols/jabber/jabber.c:270
 msgid "Read Error"
 msgstr "读取错误"
 
-#: src/protocols/jabber/jabber.c:376 src/protocols/jabber/jabber.c:709
+#: src/protocols/jabber/jabber.c:377 src/protocols/jabber/jabber.c:713
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:417 src/protocols/jabber/jabber.c:749
-#: src/protocols/trepia/trepia.c:1074
+#: src/protocols/jabber/jabber.c:418 src/protocols/jabber/jabber.c:753
+#: src/protocols/trepia/trepia.c:1075
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/jabber/jabber.c:442
+#: src/protocols/jabber/jabber.c:446
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
+#: src/protocols/jabber/jabber.c:448 src/protocols/jabber/jabber.c:449
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: src/protocols/jabber/jabber.c:451 src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:1234
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
+#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:458
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: src/protocols/jabber/jabber.c:565 src/protocols/jabber/jabber.c:566
+#: src/protocols/jabber/jabber.c:569 src/protocols/jabber/jabber.c:570
 msgid "Already Registered"
 msgstr "已注册"
 
-#: src/protocols/jabber/jabber.c:601 src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:605 src/protocols/jabber/jabber.c:1089
 msgid "Password"
 msgstr "密码"
 
-#: src/protocols/jabber/jabber.c:612
+#: src/protocols/jabber/jabber.c:616
 msgid "E-Mail"
 msgstr "电子邮件"
 
 #. State
-#: src/protocols/jabber/jabber.c:642 src/protocols/oscar/oscar.c:5251
-#: src/protocols/oscar/oscar.c:5259 src/protocols/trepia/trepia.c:336
+#: 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/trepia/trepia.c:414
 msgid "State"
 msgstr "州/省"
 
-#: src/protocols/jabber/jabber.c:652 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:653 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:656 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:662
+#: src/protocols/jabber/jabber.c:666
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:670
+#: src/protocols/jabber/jabber.c:674
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: src/protocols/jabber/jabber.c:673 src/protocols/jabber/jabber.c:674
+#: src/protocols/jabber/jabber.c:677 src/protocols/jabber/jabber.c:678
 msgid "Register New Jabber Account"
 msgstr "注册新的 Jabber 账户"
 
-#: src/protocols/jabber/jabber.c:805
+#: src/protocols/jabber/jabber.c:809
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: src/protocols/jabber/jabber.c:811 src/protocols/msn/session.c:365
+#: src/protocols/jabber/jabber.c:815 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:820
+#: src/protocols/jabber/jabber.c:824
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: src/protocols/jabber/jabber.c:892 src/protocols/jabber/jabber.c:1208
-#: src/protocols/jabber/jabber.c:1249 src/protocols/jabber/jabber.c:1282
-#: src/protocols/oscar/oscar.c:753 src/protocols/oscar/oscar.c:6834
+#: 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
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:925
+#: src/protocols/jabber/jabber.c:928
 msgid "Both"
 msgstr "双向"
 
-#: src/protocols/jabber/jabber.c:927
+#: src/protocols/jabber/jabber.c:930
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: src/protocols/jabber/jabber.c:929
-msgid "From"
-msgstr "来自"
-
 #: src/protocols/jabber/jabber.c:932
+msgid "From"
+msgstr "来自"
+
+#: src/protocols/jabber/jabber.c:935
 msgid "To"
 msgstr "到"
 
-#: src/protocols/jabber/jabber.c:934
+#: src/protocols/jabber/jabber.c:937
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:941
 msgid "Subscription"
 msgstr "订阅"
 
-#: src/protocols/jabber/jabber.c:976 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: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
 msgid "Priority"
 msgstr "优先级"
 
-#: src/protocols/jabber/jabber.c:1028
+#: src/protocols/jabber/jabber.c:1032
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: src/protocols/jabber/jabber.c:1029
+#: src/protocols/jabber/jabber.c:1033
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: src/protocols/jabber/jabber.c:1033 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:1037 src/protocols/jabber/jabber.c:1038
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: src/protocols/jabber/jabber.c:1090
+#: src/protocols/jabber/jabber.c:1094
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: src/protocols/jabber/jabber.c:1095 src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1099 src/protocols/jabber/jabber.c:1100
 msgid "Change Jabber Password"
 msgstr "更改 Jabber 密码"
 
-#: src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1100
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: src/protocols/jabber/jabber.c:1106 src/protocols/toc/toc.c:1567
+#: src/protocols/jabber/jabber.c:1110 src/protocols/toc/toc.c:1657
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1192
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: src/protocols/jabber/jabber.c:1190
-msgid "Conflict"
-msgstr "冲突"
-
-#: src/protocols/jabber/jabber.c:1192
-msgid "Feature Not Implemented"
-msgstr "特性未实现"
-
 #: src/protocols/jabber/jabber.c:1194
+msgid "Conflict"
+msgstr "冲突"
+
+#: src/protocols/jabber/jabber.c:1196
+msgid "Feature Not Implemented"
+msgstr "特性未实现"
+
+#: src/protocols/jabber/jabber.c:1198
 msgid "Forbidden"
 msgstr "禁止"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1200
 msgid "Gone"
 msgstr "已走"
 
-#: src/protocols/jabber/jabber.c:1198 src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1276
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1204
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1206
 msgid "Malformed Jabber ID"
 msgstr "Jabber ID 格式错误"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1208
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: src/protocols/jabber/jabber.c:1206
-msgid "Not Allowed"
-msgstr "不允许"
-
 #: src/protocols/jabber/jabber.c:1210
+msgid "Not Allowed"
+msgstr "不允许"
+
+#: src/protocols/jabber/jabber.c:1214
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1216
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1220
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1222
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1224
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: src/protocols/jabber/jabber.c:1222
-msgid "Server Overloaded"
-msgstr "服务器超载"
-
-#: src/protocols/jabber/jabber.c:1224
-msgid "Service Unavailable"
-msgstr "服务不可用"
-
 #: src/protocols/jabber/jabber.c:1226
+msgid "Server Overloaded"
+msgstr "服务器超载"
+
+#: src/protocols/jabber/jabber.c:1228
+msgid "Service Unavailable"
+msgstr "服务不可用"
+
+#: src/protocols/jabber/jabber.c:1230
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1232
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1239
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1241
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1244
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1247
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1250
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1255
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: src/protocols/jabber/jabber.c:1253
-msgid "Authentication Failure"
-msgstr "认证失败"
-
 #: src/protocols/jabber/jabber.c:1257
+msgid "Authentication Failure"
+msgstr "认证失败"
+
+#: src/protocols/jabber/jabber.c:1261
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1263
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: src/protocols/jabber/jabber.c:1262
+#: src/protocols/jabber/jabber.c:1266
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: src/protocols/jabber/jabber.c:1264 src/protocols/silc/ops.c:1509
+#: src/protocols/jabber/jabber.c:1268 src/protocols/silc/ops.c:1518
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: src/protocols/jabber/jabber.c:1266
+#: src/protocols/jabber/jabber.c:1270
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:1272
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1274
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: src/protocols/jabber/jabber.c:1274
-msgid "Invalid ID"
-msgstr "无效 ID"
-
-#: src/protocols/jabber/jabber.c:1276
-msgid "Invalid Namespace"
-msgstr "无效的命名空间"
-
 #: src/protocols/jabber/jabber.c:1278
+msgid "Invalid ID"
+msgstr "无效 ID"
+
+#: src/protocols/jabber/jabber.c:1280
+msgid "Invalid Namespace"
+msgstr "无效的命名空间"
+
+#: src/protocols/jabber/jabber.c:1282
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: src/protocols/jabber/jabber.c:1280
-msgid "Non-matching Hosts"
-msgstr "不匹配的主机"
-
 #: src/protocols/jabber/jabber.c:1284
+msgid "Non-matching Hosts"
+msgstr "不匹配的主机"
+
+#: src/protocols/jabber/jabber.c:1288
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: src/protocols/jabber/jabber.c:1286
-msgid "Remote Connection Failed"
-msgstr "远程连接失败"
-
-#: src/protocols/jabber/jabber.c:1288
-msgid "Resource Constraint"
-msgstr "资源约束"
-
 #: src/protocols/jabber/jabber.c:1290
-msgid "Restricted XML"
-msgstr "限制的 XML"
+msgid "Remote Connection Failed"
+msgstr "远程连接失败"
 
 #: src/protocols/jabber/jabber.c:1292
-msgid "See Other Host"
-msgstr "查看其它主机"
+msgid "Resource Constraint"
+msgstr "资源约束"
 
 #: src/protocols/jabber/jabber.c:1294
-msgid "System Shutdown"
-msgstr "系统关机"
+msgid "Restricted XML"
+msgstr "限制的 XML"
 
 #: src/protocols/jabber/jabber.c:1296
+msgid "See Other Host"
+msgstr "查看其它主机"
+
+#: src/protocols/jabber/jabber.c:1298
+msgid "System Shutdown"
+msgstr "系统关机"
+
+#: src/protocols/jabber/jabber.c:1300
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1302
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1304
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: src/protocols/jabber/jabber.c:1302
+#: src/protocols/jabber/jabber.c:1306
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1308
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1310
 msgid "Stream Error"
 msgstr "流错误"
 
-#: src/protocols/jabber/jabber.c:1373
+#: src/protocols/jabber/jabber.c:1377
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: src/protocols/jabber/jabber.c:1425
+#: src/protocols/jabber/jabber.c:1429
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: src/protocols/jabber/jabber.c:1451
+#: src/protocols/jabber/jabber.c:1455
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1459
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1468
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1473
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: src/protocols/jabber/jabber.c:1475
+#: src/protocols/jabber/jabber.c:1479
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: src/protocols/jabber/jabber.c:1481
+#: src/protocols/jabber/jabber.c:1485
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: src/protocols/jabber/jabber.c:1487
+#: src/protocols/jabber/jabber.c:1491
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [房间]: 邀请用户加入房间。"
 
-#: src/protocols/jabber/jabber.c:1493
+#: src/protocols/jabber/jabber.c:1497
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: src/protocols/jabber/jabber.c:1499
+#: src/protocols/jabber/jabber.c:1503
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: src/protocols/jabber/jabber.c:1504
+#: src/protocols/jabber/jabber.c:1508
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
@@ -6286,24 +6397,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1585 src/protocols/jabber/jabber.c:1587
+#: src/protocols/jabber/jabber.c:1589 src/protocols/jabber/jabber.c:1591
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:1613
+#: src/protocols/jabber/jabber.c:1617
 msgid "Use TLS if available"
 msgstr "若可用则使用 TLS"
 
-#: src/protocols/jabber/jabber.c:1618
-msgid "Force old SSL"
-msgstr "强制旧 SSL"
-
-#: src/protocols/jabber/jabber.c:1623
+#: src/protocols/jabber/jabber.c:1622
+msgid "Require TLS"
+msgstr "需要 TLS"
+
+#: src/protocols/jabber/jabber.c:1625
+msgid "Force old (port 5223) SSL"
+msgstr "强制旧 SSL(5223 端口)"
+
+#: src/protocols/jabber/jabber.c:1630
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1632 src/protocols/silc/silc.c:1589
+#: src/protocols/jabber/jabber.c:1639 src/protocols/silc/silc.c:1603
 msgid "Connect server"
 msgstr "连接服务器"
 
@@ -6322,16 +6437,16 @@
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: src/protocols/jabber/message.c:233
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: src/protocols/jabber/message.c:236
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber 消息错误"
 
-#: src/protocols/jabber/message.c:300
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
@@ -6340,59 +6455,59 @@
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: src/protocols/jabber/presence.c:268
+#: src/protocols/jabber/presence.c:282
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/presence.c:271
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "用户 %s 想要将您添加为好友。"
-
-#: src/protocols/jabber/presence.c:277 src/protocols/msn/userlist.c:102
-#: src/protocols/oscar/oscar.c:3861 src/protocols/oscar/oscar.c:6484
+#: src/protocols/jabber/presence.c:287 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
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/jabber/presence.c:278 src/protocols/msn/userlist.c:103
-#: src/protocols/oscar/oscar.c:3863 src/protocols/oscar/oscar.c:6485
+#: src/protocols/jabber/presence.c:296 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:3850 src/protocols/oscar/oscar.c:6392
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/protocols/jabber/presence.c:325 src/protocols/jabber/presence.c:326
+#: src/protocols/jabber/presence.c:343 src/protocols/jabber/presence.c:344
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: src/protocols/jabber/presence.c:327
+#: src/protocols/jabber/presence.c:345
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: src/protocols/jabber/presence.c:329
+#: src/protocols/jabber/presence.c:347
 msgid "Configure Room"
 msgstr "配置房间"
 
-#: src/protocols/jabber/presence.c:331
+#: src/protocols/jabber/presence.c:349
 msgid "Accept Defaults"
 msgstr "接受默认值"
 
-#: src/protocols/jabber/presence.c:368
+#: src/protocols/jabber/presence.c:386
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: src/protocols/jabber/presence.c:371
+#: src/protocols/jabber/presence.c:389
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: src/protocols/jabber/si.c:585
+#: src/protocols/jabber/si.c:591
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: src/protocols/jabber/si.c:586 src/protocols/jabber/si.c:587
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
@@ -6460,7 +6575,7 @@
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:684
 msgid "User is offline"
 msgstr "用户离线"
 
@@ -6605,8 +6720,8 @@
 msgid "Server too busy"
 msgstr "服务器太忙"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2258
-#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2256
+#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "认证失败"
 
@@ -6692,8 +6807,8 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:502 src/protocols/msn/msn.c:509
-#: src/protocols/msn/msn.c:512 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/msn/msn.c:503 src/protocols/msn/msn.c:510
+#: src/protocols/msn/msn.c:513 src/protocols/yahoo/yahoo.c:2660
 #, c-format
 msgid ""
 "\n"
@@ -6702,75 +6817,75 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:509
+#: src/protocols/msn/msn.c:510
 msgid "Has you"
 msgstr "有你"
 
-#: src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:513
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: src/protocols/msn/msn.c:543 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/yahoo/yahoo.c:2931
+#: src/protocols/msn/msn.c:544 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2517 src/protocols/yahoo/yahoo.c:3030
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:547 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
-#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1397
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2424
-#: src/protocols/yahoo/yahoo.c:2934
+#: 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
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:551 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2432 src/protocols/yahoo/yahoo.c:2946
+#: src/protocols/msn/msn.c:552 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2527 src/protocols/yahoo/yahoo.c:3045
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:555 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2952
+#: src/protocols/msn/msn.c:556 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2531 src/protocols/yahoo/yahoo.c:3051
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:559 src/protocols/zephyr/zephyr.c:2221
+#: src/protocols/msn/msn.c:560 src/protocols/zephyr/zephyr.c:2267
 #: src/status.c:159
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:571
+#: src/protocols/msn/msn.c:572
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:576
+#: src/protocols/msn/msn.c:577
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:580
+#: src/protocols/msn/msn.c:581
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:584
+#: src/protocols/msn/msn.c:585
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:590
+#: src/protocols/msn/msn.c:591
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:595
+#: src/protocols/msn/msn.c:596
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:618
+#: src/protocols/msn/msn.c:619
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:627 src/protocols/novell/novell.c:3380
+#: src/protocols/msn/msn.c:628 src/protocols/novell/novell.c:3438
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:665
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6778,95 +6893,95 @@
 "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
 "ssl.php 中的更多信息。"
 
-#: src/protocols/msn/msn.c:691
+#: src/protocols/msn/msn.c:693
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: src/protocols/msn/msn.c:1333 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: 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
 #, 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:1340 src/protocols/msn/msn.c:1687
-#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:787
+#: src/protocols/msn/msn.c:1346 src/protocols/msn/msn.c:1693
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:789
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1417
+#: src/protocols/msn/msn.c:1423
 msgid "MSN Profile"
 msgstr "MSN 个人资料"
 
-#: src/protocols/msn/msn.c:1422 src/protocols/msn/msn.c:1674
+#: src/protocols/msn/msn.c:1428 src/protocols/msn/msn.c:1680
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
 #. Age
-#: src/protocols/msn/msn.c:1493 src/protocols/oscar/oscar.c:5236
+#: src/protocols/msn/msn.c:1499 src/protocols/oscar/oscar.c:5213
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "年龄"
 
 #. Gender
-#: src/protocols/msn/msn.c:1500 src/protocols/oscar/oscar.c:5223
+#: src/protocols/msn/msn.c:1506 src/protocols/oscar/oscar.c:5200
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "性别"
 
-#: src/protocols/msn/msn.c:1509 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1515 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: src/protocols/msn/msn.c:1516 src/protocols/novell/novell.c:1454
+#: src/protocols/msn/msn.c:1522 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "位置"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1530 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "职业"
 
-#: src/protocols/msn/msn.c:1541 src/protocols/msn/msn.c:1547
-#: src/protocols/msn/msn.c:1554 src/protocols/msn/msn.c:1562
-#: src/protocols/msn/msn.c:1569
+#: 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
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: src/protocols/msn/msn.c:1578 src/protocols/msn/msn.c:1584
-#: src/protocols/msn/msn.c:1591 src/protocols/msn/msn.c:1598
+#: src/protocols/msn/msn.c:1584 src/protocols/msn/msn.c:1590
+#: src/protocols/msn/msn.c:1597 src/protocols/msn/msn.c:1604
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1613
-#: src/protocols/msn/msn.c:1620
+#: src/protocols/msn/msn.c:1613 src/protocols/msn/msn.c:1619
+#: src/protocols/msn/msn.c:1626
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: src/protocols/msn/msn.c:1629 src/protocols/msn/msn.c:1635
+#: src/protocols/msn/msn.c:1635 src/protocols/msn/msn.c:1641
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: src/protocols/msn/msn.c:1643 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1649 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "上次更新"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1654 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1660 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:1676
+#: src/protocols/msn/msn.c:1682
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: src/protocols/msn/msn.c:1677
+#: src/protocols/msn/msn.c:1683
 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 "
@@ -6875,13 +6990,13 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: src/protocols/msn/msn.c:1681
+#: src/protocols/msn/msn.c:1687
 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:1687 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1693 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -6895,20 +7010,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1892 src/protocols/msn/msn.c:1894
+#: src/protocols/msn/msn.c:1898 src/protocols/msn/msn.c:1900
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1913 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1919 src/protocols/trepia/trepia.c:1300
 msgid "Login server"
 msgstr "登录服务器"
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1928
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1312
+#: src/protocols/yahoo/yahoochat.c:1339
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -6918,7 +7033,7 @@
 msgstr "%s 不是有效的组名。"
 
 #: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:344
+#: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "未知错误。"
 
@@ -6952,15 +7067,15 @@
 msgid "%s is not a valid passport account."
 msgstr "%s 不是有效的通行证账户。"
 
-#: src/protocols/msn/notification.c:778
+#: src/protocols/msn/notification.c:809
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: src/protocols/msn/notification.c:833
+#: src/protocols/msn/notification.c:864
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: src/protocols/msn/notification.c:1264
+#: src/protocols/msn/notification.c:1295
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6990,8 +7105,8 @@
 msgid "Reading error"
 msgstr "读取错误"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:336
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4171
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -7004,57 +7119,60 @@
 "%s 服务器(%s)的连接错误:\n"
 "%s"
 
-#: src/protocols/msn/session.c:314
+#: src/protocols/msn/session.c:317
 msgid "Our protocol is not supported by the server."
 msgstr "服务器不支持此协议。"
 
-#: src/protocols/msn/session.c:318
+#: src/protocols/msn/session.c:321
 msgid "Error parsing HTTP."
 msgstr "分析 HTTP 出错。"
 
-#: src/protocols/msn/session.c:322
+#. 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
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/session.c:325
+#: src/protocols/msn/session.c:328
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:330
+#: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: src/protocols/msn/session.c:334
+#: src/protocols/msn/session.c:337
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "无法通过身份验证: %s"
 
-#: src/protocols/msn/session.c:339
+#: src/protocols/msn/session.c:342
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: src/protocols/msn/session.c:360 src/protocols/msn/session.c:362
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
 msgid "Handshaking"
 msgstr "握手"
 
-#: src/protocols/msn/session.c:361
+#: src/protocols/msn/session.c:364
 msgid "Transferring"
 msgstr "文件传送"
 
-#: src/protocols/msn/session.c:363
+#: src/protocols/msn/session.c:366
 msgid "Starting authentication"
 msgstr "开始身份验证"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:367
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:369
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: src/protocols/msn/session.c:367 src/protocols/trepia/trepia.c:637
+#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -7062,89 +7180,84 @@
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/switchboard.c:377
+#: src/protocols/msn/switchboard.c:405
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "消息未发出,因为发生了超时:"
 
-#: src/protocols/msn/switchboard.c:385
+#: src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "消息未发出,隐身时不允许:"
 
-#: src/protocols/msn/switchboard.c:389
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "消息未发出,因为用户离线:"
 
-#: src/protocols/msn/switchboard.c:393
+#: src/protocols/msn/switchboard.c:421
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "消息未发出,因为发生了连接错误:"
 
-#: src/protocols/msn/switchboard.c:397
+#: src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "消息未发出,因为切换板发生了错误:"
 
-#: src/protocols/msn/switchboard.c:405
+#: src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#: src/protocols/msn/switchboard.c:647
+#: src/protocols/msn/switchboard.c:689
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/userlist.c:86
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
 
-#: src/protocols/msn/userlist.c:95
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
-msgstr "用户 %s 想要将 %s 添加为好友。"
-
-#: src/protocols/napster/napster.c:241
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:255
+#: src/protocols/napster/napster.c:274
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
 
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:290
+msgid "Unknown server error."
+msgstr "未知服务器错误。"
+
+#: src/protocols/napster/napster.c:339
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数: %s,文件数: %s,大小: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:329
+#: src/protocols/napster/napster.c:350
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:337
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:395
+#: src/protocols/napster/napster.c:414
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:433
-msgid ""
-"You were disconnected from the server, because you logged on from a "
-"different location"
-msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
-
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:439
+#: src/protocols/napster/napster.c:455
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1277
+#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -7158,7 +7271,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
+#: src/protocols/napster/napster.c:689 src/protocols/napster/napster.c:691
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -7392,8 +7505,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5209
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5186
+#: src/protocols/oscar/oscar.c:5193
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -7490,7 +7603,7 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
-#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
+#: src/protocols/novell/novell.c:2955 src/protocols/novell/novell.c:3043
 msgid "Appear Offline"
 msgstr "显示为离线"
 
@@ -7504,15 +7617,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
+#: src/protocols/novell/novell.c:3537 src/protocols/novell/novell.c:3539
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: src/protocols/novell/novell.c:3500
+#: src/protocols/novell/novell.c:3558
 msgid "Server address"
 msgstr "服务器地址"
 
-#: src/protocols/novell/novell.c:3504
+#: src/protocols/novell/novell.c:3562
 msgid "Server port"
 msgstr "服务器端口"
 
@@ -7612,184 +7725,184 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:406 src/protocols/oscar/oscar.c:489
+#: src/protocols/oscar/oscar.c:404 src/protocols/oscar/oscar.c:487
 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:600
+#: src/protocols/oscar/oscar.c:598
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:603
+#: src/protocols/oscar/oscar.c:601
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: src/protocols/oscar/oscar.c:606 src/protocols/silc/silc.c:649
-#: src/protocols/silc/util.c:506
+#: src/protocols/oscar/oscar.c:604 src/protocols/silc/silc.c:668
+#: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:609 src/protocols/oscar/oscar.c:7181
+#: src/protocols/oscar/oscar.c:607 src/protocols/oscar/oscar.c:7033
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:614
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:617
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:620
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:625
+#: src/protocols/oscar/oscar.c:623
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: src/protocols/oscar/oscar.c:628
+#: src/protocols/oscar/oscar.c:626
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:631
+#: src/protocols/oscar/oscar.c:629
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:634
+#: src/protocols/oscar/oscar.c:632
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:637
+#: src/protocols/oscar/oscar.c:635
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:640
+#: src/protocols/oscar/oscar.c:638
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:641
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:644
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:649
+#: src/protocols/oscar/oscar.c:647
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:650
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: src/protocols/oscar/oscar.c:655
+#: src/protocols/oscar/oscar.c:653
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:657
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:660
 msgid "Live Video"
 msgstr "实时视频"
 
-#: src/protocols/oscar/oscar.c:665
+#: src/protocols/oscar/oscar.c:663
 msgid "Camera"
 msgstr "相机"
 
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:7064
+#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:6916
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:7079
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:6931
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:7069
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:6921
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:693
+#: src/protocols/oscar/oscar.c:691
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:771
+#: src/protocols/oscar/oscar.c:769
 msgid "Capabilities"
 msgstr "能力"
 
-#: src/protocols/oscar/oscar.c:780
+#: src/protocols/oscar/oscar.c:778
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: src/protocols/oscar/oscar.c:937
+#: src/protocols/oscar/oscar.c:935
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:939
+#: src/protocols/oscar/oscar.c:937
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:947
+#: src/protocols/oscar/oscar.c:945
 msgid "Direct Connect failed"
 msgstr "二人世界连接失败"
 
-#: src/protocols/oscar/oscar.c:1024 src/protocols/oscar/oscar.c:1155
+#: src/protocols/oscar/oscar.c:1022 src/protocols/oscar/oscar.c:1153
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:1105
+#: src/protocols/oscar/oscar.c:1103
 #, 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:1531
+#: src/protocols/oscar/oscar.c:1529
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: src/protocols/oscar/oscar.c:1536
+#: src/protocols/oscar/oscar.c:1534
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:1571
+#: src/protocols/oscar/oscar.c:1569
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1573
 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:1579 src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:1577 src/protocols/oscar/oscar.c:3615
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/oscar/oscar.c:1643
+#: src/protocols/oscar/oscar.c:1641
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "您已经丢失与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:1666
+#: src/protocols/oscar/oscar.c:1664
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:1747
+#: src/protocols/oscar/oscar.c:1745
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: src/protocols/oscar/oscar.c:1771
+#: src/protocols/oscar/oscar.c:1769
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7799,46 +7912,46 @@
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: src/protocols/oscar/oscar.c:1801
+#: src/protocols/oscar/oscar.c:1799
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:2350
+#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2346
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:1913
+#: src/protocols/oscar/oscar.c:1911
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:2026 src/protocols/yahoo/yahoo_filexfer.c:181
-#: src/protocols/yahoo/yahoo_filexfer.c:190
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/oscar/oscar.c:2024 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:2031
+#: src/protocols/oscar/oscar.c:2029
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
-#: src/protocols/oscar/oscar.c:2110
+#: src/protocols/oscar/oscar.c:2108
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:2235 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2233 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
-#: src/protocols/oscar/oscar.c:2240
+#: src/protocols/oscar/oscar.c:2238
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2244
+#: src/protocols/oscar/oscar.c:2242
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2247
 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."
@@ -7846,33 +7959,33 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/oscar/oscar.c:2254
+#: src/protocols/oscar/oscar.c:2252
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:2285
+#: src/protocols/oscar/oscar.c:2283
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:2357
+#: src/protocols/oscar/oscar.c:2353
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: src/protocols/oscar/oscar.c:2381
+#: src/protocols/oscar/oscar.c:2377
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2391
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2392
 msgid "Enter the 6 digit number from the digital display."
 msgstr "输入所显示的六位数字。"
 
-#: src/protocols/oscar/oscar.c:2436 src/protocols/oscar/oscar.c:2466
-#: src/protocols/oscar/oscar.c:2555
+#: src/protocols/oscar/oscar.c:2432 src/protocols/oscar/oscar.c:2462
+#: src/protocols/oscar/oscar.c:2551
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7880,24 +7993,24 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:2439 src/protocols/oscar/oscar.c:2469
+#: src/protocols/oscar/oscar.c:2435 src/protocols/oscar/oscar.c:2465
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:2558
+#: src/protocols/oscar/oscar.c:2554
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2585
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/oscar/oscar.c:3609
+#: src/protocols/oscar/oscar.c:3606
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:3612
+#: src/protocols/oscar/oscar.c:3609
 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 "
@@ -7906,54 +8019,53 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:3651
+#: src/protocols/oscar/oscar.c:3648
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3656
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:3660
+#: src/protocols/oscar/oscar.c:3657
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:3690
+#: src/protocols/oscar/oscar.c:3687
 #, 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:3695 src/protocols/oscar/oscar.c:3697
+#: src/protocols/oscar/oscar.c:3692 src/protocols/oscar/oscar.c:3694
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:3745 src/protocols/oscar/oscar.c:3747
-#: src/protocols/oscar/oscar.c:3754 src/protocols/oscar/oscar.c:3851
-#: src/protocols/oscar/oscar.c:3871 src/protocols/oscar/oscar.c:6476
-#: src/protocols/oscar/oscar.c:6522
+#: 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
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:3753
+#: src/protocols/oscar/oscar.c:3737
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:3851
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3836
+#, c-format
+msgid ""
+"The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %u 想要将您加为他/她的好友,理由如下:\n"
+"用户 %u 想要将 %s 加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3859 src/protocols/oscar/oscar.c:6482
+#: src/protocols/oscar/oscar.c:3846 src/protocols/oscar/oscar.c:6389
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:3871
+#: src/protocols/oscar/oscar.c:3858
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7963,17 +8075,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3872
+#: src/protocols/oscar/oscar.c:3859
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3866
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3874
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7986,7 +8098,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3895
+#: src/protocols/oscar/oscar.c:3882
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7999,7 +8111,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3903
+#: src/protocols/oscar/oscar.c:3890
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8012,32 +8124,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:3911
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3917
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3921
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:4018
+#: src/protocols/oscar/oscar.c:4005
 #, 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:4027
+#: src/protocols/oscar/oscar.c:4014
 #, 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:4036
+#: src/protocols/oscar/oscar.c:4023
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8045,89 +8157,89 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4032
 #, 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:4054
+#: src/protocols/oscar/oscar.c:4041
 #, 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:4063
+#: src/protocols/oscar/oscar.c:4050
 #, 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:4117 src/protocols/oscar/oscar.c:4351
+#: src/protocols/oscar/oscar.c:4104 src/protocols/oscar/oscar.c:4338
 #: 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:4183
+#: src/protocols/oscar/oscar.c:4170
 #, 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:4220
+#: src/protocols/oscar/oscar.c:4207
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: src/protocols/oscar/oscar.c:4220 src/protocols/oscar/oscar.c:4225
-#: src/protocols/oscar/oscar.c:4283 src/protocols/oscar/oscar.c:4287
+#: src/protocols/oscar/oscar.c:4207 src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4270 src/protocols/oscar/oscar.c:4274
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: src/protocols/oscar/oscar.c:4223
+#: src/protocols/oscar/oscar.c:4210
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4270
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用: %s"
 
-#: src/protocols/oscar/oscar.c:4286
+#: src/protocols/oscar/oscar.c:4273
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息不可用:"
 
-#: src/protocols/oscar/oscar.c:4309
+#: src/protocols/oscar/oscar.c:4296
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: src/protocols/oscar/oscar.c:4313
+#: src/protocols/oscar/oscar.c:4300
 msgid "Online Since"
 msgstr "上线时间"
 
-#: src/protocols/oscar/oscar.c:4318 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4305 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "注册时间"
 
-#: src/protocols/oscar/oscar.c:4402
+#: src/protocols/oscar/oscar.c:4389
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4588
+#: src/protocols/oscar/oscar.c:4575
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: src/protocols/oscar/oscar.c:4808
+#: src/protocols/oscar/oscar.c:4795
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:4809
+#: src/protocols/oscar/oscar.c:4796
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8135,160 +8247,155 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: src/protocols/oscar/oscar.c:4878
-msgid ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
-msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
-
-#: src/protocols/oscar/oscar.c:4880
+#: src/protocols/oscar/oscar.c:4867
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/toc/toc.c:881
+#: src/protocols/oscar/oscar.c:4880 src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:4927
+#. XXX - Don't call this with ssi
+#: src/protocols/oscar/oscar.c:4905
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: src/protocols/oscar/oscar.c:5221 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5198 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5200 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:5223 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5200 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:5239
+#: src/protocols/oscar/oscar.c:5216
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: src/protocols/oscar/oscar.c:5243
+#: src/protocols/oscar/oscar.c:5220
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: src/protocols/oscar/oscar.c:5248
+#: src/protocols/oscar/oscar.c:5225
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: src/protocols/oscar/oscar.c:5252 src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:5229 src/protocols/oscar/oscar.c:5237
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: src/protocols/oscar/oscar.c:5256
+#: src/protocols/oscar/oscar.c:5233
 msgid "Work Address"
 msgstr "办公地址"
 
-#: src/protocols/oscar/oscar.c:5264
+#: src/protocols/oscar/oscar.c:5241
 msgid "Work Information"
 msgstr "工作信息"
 
-#: src/protocols/oscar/oscar.c:5265
+#: src/protocols/oscar/oscar.c:5242
 msgid "Company"
 msgstr "公司"
 
-#: src/protocols/oscar/oscar.c:5266
+#: src/protocols/oscar/oscar.c:5243
 msgid "Division"
 msgstr "部门"
 
-#: src/protocols/oscar/oscar.c:5267
+#: src/protocols/oscar/oscar.c:5244
 msgid "Position"
 msgstr "职务"
 
-#: src/protocols/oscar/oscar.c:5269
+#: src/protocols/oscar/oscar.c:5246
 msgid "Web Page"
 msgstr "网页"
 
-#: src/protocols/oscar/oscar.c:5279
+#: src/protocols/oscar/oscar.c:5256
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 信息"
 
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5305
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
 #. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5327
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列用户名已经和 %s 关联"
 
-#: src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5352
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:5396
+#: src/protocols/oscar/oscar.c:5373
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:5398
+#: src/protocols/oscar/oscar.c:5375
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5406
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5409
 #, 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:5435
+#: src/protocols/oscar/oscar.c:5412
 #, 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:5438
+#: src/protocols/oscar/oscar.c:5415
 #, 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:5441
+#: src/protocols/oscar/oscar.c:5418
 #, 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:5444
+#: src/protocols/oscar/oscar.c:5421
 #, 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:5447
+#: src/protocols/oscar/oscar.c:5424
 #, 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:5450
+#: src/protocols/oscar/oscar.c:5427
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x: 未知错误。"
 
-#: src/protocols/oscar/oscar.c:5460
+#: src/protocols/oscar/oscar.c:5437
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8297,25 +8404,25 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5461 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:5438 src/protocols/oscar/oscar.c:5445
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:5466
+#: src/protocols/oscar/oscar.c:5443
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5510
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: src/protocols/oscar/oscar.c:5668
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:5669
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -8324,7 +8431,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5696
+#: src/protocols/oscar/oscar.c:5665
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8334,15 +8441,15 @@
 "truncated it for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:5701
+#: src/protocols/oscar/oscar.c:5670
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:5735
+#: src/protocols/oscar/oscar.c:5700
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:5736
+#: src/protocols/oscar/oscar.c:5701
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8351,7 +8458,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:5783
+#: src/protocols/oscar/oscar.c:5748
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8363,11 +8470,11 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:5753
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:5851
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8377,16 +8484,16 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: src/protocols/oscar/oscar.c:5886 src/protocols/oscar/oscar.c:6342
-#: src/protocols/oscar/oscar.c:6356
+#: src/protocols/oscar/oscar.c:5853 src/protocols/oscar/oscar.c:6245
+#: src/protocols/oscar/oscar.c:6259
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5951
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:6049
+#: src/protocols/oscar/oscar.c:5952
 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 "
@@ -8395,13 +8502,13 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:6233 src/protocols/oscar/oscar.c:6234
-#: src/protocols/oscar/oscar.c:6239 src/protocols/oscar/oscar.c:6400
-#: src/protocols/oscar/oscar.c:6401 src/protocols/oscar/oscar.c:6406
+#: 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
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:6340
+#: src/protocols/oscar/oscar.c:6243
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8409,11 +8516,11 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:6340 src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6243 src/protocols/oscar/oscar.c:6257
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6257
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8423,38 +8530,38 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:6340
 #, 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:6443
+#: src/protocols/oscar/oscar.c:6346
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:6476
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6380
+#, c-format
+msgid ""
+"The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"用户 %s 想要将您加为好友,原因如下:\n"
+"用户 %s 想要将 %s 加为好友,原因如下:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6518
+#: src/protocols/oscar/oscar.c:6425
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:6519
+#: src/protocols/oscar/oscar.c:6426
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6522
+#: src/protocols/oscar/oscar.c:6429
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8464,92 +8571,92 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6523
+#: src/protocols/oscar/oscar.c:6430
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:6561 src/protocols/toc/toc.c:1282
+#: src/protocols/oscar/oscar.c:6467 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: src/protocols/oscar/oscar.c:6600
+#: src/protocols/oscar/oscar.c:6506
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:6573
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: src/protocols/oscar/oscar.c:6802
+#: src/protocols/oscar/oscar.c:6708
 msgid "Away Message"
 msgstr "离开消息"
 
-#: src/protocols/oscar/oscar.c:7137
+#: src/protocols/oscar/oscar.c:6989
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: src/protocols/oscar/oscar.c:7138
+#: src/protocols/oscar/oscar.c:6990
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: src/protocols/oscar/oscar.c:7157
+#: src/protocols/oscar/oscar.c:7009
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7015
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:7175
+#: src/protocols/oscar/oscar.c:7027
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:7192
+#: src/protocols/oscar/oscar.c:7044
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:7252
+#: src/protocols/oscar/oscar.c:7104
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:7255
+#: src/protocols/oscar/oscar.c:7107
 msgid "Hide IP address"
 msgstr "隐藏 IP 地址"
 
-#: src/protocols/oscar/oscar.c:7258
+#: src/protocols/oscar/oscar.c:7110
 msgid "Web aware"
 msgstr "Web 状态"
 
-#: src/protocols/oscar/oscar.c:7263
+#: src/protocols/oscar/oscar.c:7115
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7132
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:7281
+#: src/protocols/oscar/oscar.c:7133
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:7288
+#: src/protocols/oscar/oscar.c:7140
 msgid "New screen name formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:7340
+#: src/protocols/oscar/oscar.c:7192
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:7385
+#: src/protocols/oscar/oscar.c:7237
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:7388
+#: src/protocols/oscar/oscar.c:7240
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: src/protocols/oscar/oscar.c:7389
+#: src/protocols/oscar/oscar.c:7241
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8557,77 +8664,77 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: src/protocols/oscar/oscar.c:7406
+#: src/protocols/oscar/oscar.c:7258
 msgid "Find Buddy by E-mail"
 msgstr "按电子邮件查找好友"
 
-#: src/protocols/oscar/oscar.c:7407
+#: src/protocols/oscar/oscar.c:7259
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: src/protocols/oscar/oscar.c:7408
+#: src/protocols/oscar/oscar.c:7260
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: src/protocols/oscar/oscar.c:7489 src/protocols/silc/silc.c:803
+#: src/protocols/oscar/oscar.c:7341 src/protocols/silc/silc.c:826
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
-#: src/protocols/oscar/oscar.c:7495
+#: src/protocols/oscar/oscar.c:7347
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: src/protocols/oscar/oscar.c:7500 src/protocols/silc/silc.c:799
+#: src/protocols/oscar/oscar.c:7352 src/protocols/silc/silc.c:822
 msgid "Change Password..."
 msgstr "更改密码..."
 
-#: src/protocols/oscar/oscar.c:7506
+#: src/protocols/oscar/oscar.c:7358
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:7510
+#: src/protocols/oscar/oscar.c:7362
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:7520
+#: src/protocols/oscar/oscar.c:7372
 msgid "Show privacy options..."
 msgstr "显示隐藏选项..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:7527
+#: src/protocols/oscar/oscar.c:7379
 msgid "Format Screen Name..."
 msgstr "格式化用户名..."
 
-#: src/protocols/oscar/oscar.c:7531
+#: src/protocols/oscar/oscar.c:7383
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:7535
+#: src/protocols/oscar/oscar.c:7387
 msgid "Display Currently Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:7539
+#: src/protocols/oscar/oscar.c:7391
 msgid "Change Currently Registered Address..."
 msgstr "更改当前注册的地址..."
 
-#: src/protocols/oscar/oscar.c:7546
+#: src/protocols/oscar/oscar.c:7398
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:7552
+#: src/protocols/oscar/oscar.c:7404
 msgid "Search for Buddy by Email..."
 msgstr "按电子邮件搜索好友..."
 
-#: src/protocols/oscar/oscar.c:7557
+#: src/protocols/oscar/oscar.c:7409
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: src/protocols/oscar/oscar.c:7627
+#: src/protocols/oscar/oscar.c:7479
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: src/protocols/oscar/oscar.c:7630
+#: src/protocols/oscar/oscar.c:7482
 msgid "Show how long you have been idle"
 msgstr "显示您睡了多长时间"
 
@@ -8641,22 +8748,112 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7727 src/protocols/oscar/oscar.c:7729
+#: src/protocols/oscar/oscar.c:7573 src/protocols/oscar/oscar.c:7575
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:7752
+#: src/protocols/oscar/oscar.c:7598
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:7755
+#: src/protocols/oscar/oscar.c:7601
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/oscar/oscar.c:7758 src/protocols/zephyr/zephyr.c:2859
+#: src/protocols/oscar/oscar.c:7604 src/protocols/zephyr/zephyr.c:2905
 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
@@ -8740,16 +8937,16 @@
 msgstr "设定聊天密码"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
-#: src/protocols/silc/ops.c:1286
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1294
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1559
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
 msgid "Show Public Key"
 msgstr "显示公钥"
 
@@ -8820,131 +9017,131 @@
 msgstr ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: src/protocols/silc/buddy.c:1391
+#: src/protocols/silc/buddy.c:1410
 msgid "Detached"
 msgstr "已脱离"
 
-#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:56
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: src/protocols/silc/buddy.c:1399 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:50
+#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
 msgid "Hyper Active"
 msgstr "多动"
 
-#: src/protocols/silc/buddy.c:1403
+#: src/protocols/silc/buddy.c:1422
 msgid "Robot"
 msgstr "机器人"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:624
-#: src/protocols/silc/util.c:469
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "高兴"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:626
-#: src/protocols/silc/util.c:471
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "郁闷"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:628
-#: src/protocols/silc/util.c:473
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "生气"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:630
-#: src/protocols/silc/util.c:475
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "警惕"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:632
-#: src/protocols/silc/util.c:477
+#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "害羞"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:479
+#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "无敌"
 
-#: src/protocols/silc/buddy.c:1422 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:481
+#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "热恋"
 
-#: src/protocols/silc/buddy.c:1424 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:483
+#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "打盹"
 
-#: src/protocols/silc/buddy.c:1426 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:485
+#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "枯燥"
 
-#: src/protocols/silc/buddy.c:1428 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:487
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "激动"
 
-#: src/protocols/silc/buddy.c:1430 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:489
+#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "饥渴"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "用户模式"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "状态文本"
 
-#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "设备"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:694
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
 msgid "Timezone"
 msgstr "时区"
 
-#: src/protocols/silc/buddy.c:1500 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1562
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: src/protocols/silc/buddy.c:1548
+#: src/protocols/silc/buddy.c:1567
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: src/protocols/silc/buddy.c:1552
+#: src/protocols/silc/buddy.c:1571
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: src/protocols/silc/buddy.c:1564
+#: src/protocols/silc/buddy.c:1583
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: src/protocols/silc/buddy.c:1571 src/protocols/silc/ops.c:1407
+#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
 msgid "Kill User"
 msgstr "杀死用户"
 
@@ -9052,7 +9249,7 @@
 msgid "Group Name"
 msgstr "组名称"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1687
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
 msgid "Passphrase"
 msgstr "密码句"
 
@@ -9149,11 +9346,11 @@
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:903
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:904
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
 msgid "Unknown command"
 msgstr "未知命令"
 
@@ -9298,7 +9495,7 @@
 msgid "More..."
 msgstr "更多..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:791
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
@@ -9314,31 +9511,41 @@
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1250
+#, fuzzy
+msgid "Roomlist"
+msgstr "房间列表"
+
+#: src/protocols/silc/ops.c:1250
+#, fuzzy
+msgid "Cannot get room list"
+msgstr "无法获取服务器统计"
+
+#: src/protocols/silc/ops.c:1295
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
+#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: src/protocols/silc/ops.c:1301
+#: src/protocols/silc/ops.c:1309
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
-#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
+#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
 msgid "Server Statistics"
 msgstr "服务器统计"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1339
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: src/protocols/silc/ops.c:1342
+#: src/protocols/silc/ops.c:1348
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
-#: src/protocols/silc/ops.c:1364
+#: src/protocols/silc/ops.c:1370
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9373,97 +9580,97 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: src/protocols/silc/ops.c:1387
+#: src/protocols/silc/ops.c:1393
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1395
+#: src/protocols/silc/ops.c:1401
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: src/protocols/silc/ops.c:1400
+#: src/protocols/silc/ops.c:1406
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: src/protocols/silc/ops.c:1408
+#: src/protocols/silc/ops.c:1414
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: src/protocols/silc/ops.c:1489
+#: src/protocols/silc/ops.c:1498
 msgid "Error during connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1503
 msgid "Key Exchange failed"
 msgstr "密钥交换失败"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1512
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-#: src/protocols/silc/ops.c:1538
+#: src/protocols/silc/ops.c:1547
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
-#: src/protocols/silc/silc.c:192
+#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
+#: src/protocols/silc/silc.c:203
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: src/protocols/silc/ops.c:1600
+#: src/protocols/silc/ops.c:1611
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: src/protocols/silc/ops.c:1647
+#: src/protocols/silc/ops.c:1658
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: src/protocols/silc/ops.c:1688
+#: src/protocols/silc/ops.c:1699
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失败: 远程不信任或不支持您的公钥"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失败: 远程不支持提议的 KE 组"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失败: 远程不支持提议的密码算法"
 
-#: src/protocols/silc/ops.c:1729
+#: src/protocols/silc/ops.c:1740
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失败: 远程不支持提议的 PKCS"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1743
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失败: 远程不支持提议的散列函数"
 
-#: src/protocols/silc/ops.c:1735
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失败: 远程不支持 HMAC"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1748
 msgid "Failure: Incorrect signature"
 msgstr "失败: 签名不正确"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Invalid cookie"
 msgstr "失败: 无效的 cookie"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1761
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
@@ -9504,36 +9711,36 @@
 msgid "Unsupported public key type"
 msgstr "不支持的公钥类型"
 
-#: src/protocols/silc/silc.c:152
+#: src/protocols/silc/silc.c:163
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/protocols/silc/silc.c:184
+#: src/protocols/silc/silc.c:195
 msgid "Cannot initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:206
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: src/protocols/silc/silc.c:267
+#: src/protocols/silc/silc.c:279
 msgid "Out of memory"
 msgstr "内存溢出"
 
 #. Progress
-#: src/protocols/silc/silc.c:301
+#: src/protocols/silc/silc.c:318
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/silc.c:639
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/silc.c:641
 msgid "Normal"
 msgstr "普通"
 
-#: src/protocols/silc/silc.c:647
+#: src/protocols/silc/silc.c:666
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9541,43 +9748,43 @@
 "\n"
 "您首选的联系方式"
 
-#: src/protocols/silc/silc.c:655 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "短信"
 
-#: src/protocols/silc/silc.c:657 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "彩信"
 
-#: src/protocols/silc/silc.c:659 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: src/protocols/silc/silc.c:664
+#: src/protocols/silc/silc.c:683
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: src/protocols/silc/silc.c:671
+#: src/protocols/silc/silc.c:690
 msgid "Online Services"
 msgstr "在线服务"
 
-#: src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:693
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: src/protocols/silc/silc.c:680
+#: src/protocols/silc/silc.c:699
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:706
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: src/protocols/silc/silc.c:700 src/protocols/silc/silc.c:701
+#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: src/protocols/silc/silc.c:702
+#: src/protocols/silc/silc.c:721
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9586,182 +9793,182 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: src/protocols/silc/silc.c:742 src/protocols/silc/silc.c:748
-#: src/protocols/silc/silc.c:1148
+#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
+#: src/protocols/silc/silc.c:1171
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: src/protocols/silc/silc.c:742
+#: src/protocols/silc/silc.c:761
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: src/protocols/silc/silc.c:743 src/protocols/silc/silc.c:1143
+#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: src/protocols/silc/silc.c:786
+#: src/protocols/silc/silc.c:809
 msgid "Online Status"
 msgstr "在线状态"
 
-#: src/protocols/silc/silc.c:795
+#: src/protocols/silc/silc.c:818
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: src/protocols/silc/silc.c:868
+#: src/protocols/silc/silc.c:891
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: src/protocols/silc/silc.c:1019
+#: src/protocols/silc/silc.c:1042
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: src/protocols/silc/silc.c:1100
+#: src/protocols/silc/silc.c:1123
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1225
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: src/protocols/silc/silc.c:1207
+#: src/protocols/silc/silc.c:1230
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: src/protocols/silc/silc.c:1209
+#: src/protocols/silc/silc.c:1232
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: src/protocols/silc/silc.c:1222
+#: src/protocols/silc/silc.c:1245
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: src/protocols/silc/silc.c:1252
+#: src/protocols/silc/silc.c:1275
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知命令: %s,(可能是 Gaim bug)"
 
-#: src/protocols/silc/silc.c:1315
+#: src/protocols/silc/silc.c:1338
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1319
+#: src/protocols/silc/silc.c:1342
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: src/protocols/silc/silc.c:1323
+#: src/protocols/silc/silc.c:1346
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: src/protocols/silc/silc.c:1328
+#: src/protocols/silc/silc.c:1351
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: src/protocols/silc/silc.c:1332
+#: src/protocols/silc/silc.c:1355
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: src/protocols/silc/silc.c:1336
+#: src/protocols/silc/silc.c:1359
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1340 src/protocols/zephyr/zephyr.c:2563
+#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2609
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: src/protocols/silc/silc.c:1344
+#: src/protocols/silc/silc.c:1367
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: src/protocols/silc/silc.c:1348
+#: src/protocols/silc/silc.c:1371
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1375
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1379
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1383
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1389
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: src/protocols/silc/silc.c:1370
+#: src/protocols/silc/silc.c:1393
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: src/protocols/silc/silc.c:1374
+#: src/protocols/silc/silc.c:1397
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: src/protocols/silc/silc.c:1378
+#: src/protocols/silc/silc.c:1401
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: src/protocols/silc/silc.c:1382
+#: src/protocols/silc/silc.c:1405
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: src/protocols/silc/silc.c:1386
+#: src/protocols/silc/silc.c:1409
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1413
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: src/protocols/silc/silc.c:1394
+#: src/protocols/silc/silc.c:1417
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: src/protocols/silc/silc.c:1398
+#: src/protocols/silc/silc.c:1421
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: src/protocols/silc/silc.c:1402
+#: src/protocols/silc/silc.c:1425
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: src/protocols/silc/silc.c:1406
+#: src/protocols/silc/silc.c:1429
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: src/protocols/silc/silc.c:1410
+#: src/protocols/silc/silc.c:1433
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: src/protocols/silc/silc.c:1414
+#: src/protocols/silc/silc.c:1437
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1441
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: src/protocols/silc/silc.c:1423
+#: src/protocols/silc/silc.c:1446
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: src/protocols/silc/silc.c:1427
+#: src/protocols/silc/silc.c:1450
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9769,42 +9976,30 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;频道&gt;: 列出频道中的指定用"
 "户"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1462
 msgid "Instant Messages"
 msgstr "即时消息"
 
-#: src/protocols/silc/silc.c:1444
+#: src/protocols/silc/silc.c:1467
 msgid "Digitally sign all IM messages"
 msgstr "对全部聊天消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1449
+#: src/protocols/silc/silc.c:1472
 msgid "Verify all IM message signatures"
 msgstr "校验全部聊天消息签名"
 
-#: src/protocols/silc/silc.c:1452
+#: src/protocols/silc/silc.c:1475
 msgid "Channel Messages"
 msgstr "频道消息"
 
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1480
 msgid "Digitally sign all channel messages"
 msgstr "对全部频道消息进行数字签名"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1485
 msgid "Verify all channel message signatures"
 msgstr "校验全部频道消息签名"
 
-#: src/protocols/silc/silc.c:1465
-msgid "Default SILC Key Pair"
-msgstr "默认 SILC 密钥对"
-
-#: src/protocols/silc/silc.c:1470
-msgid "SILC Public Key"
-msgstr "SILC 公钥"
-
-#: src/protocols/silc/silc.c:1475
-msgid "SILC Private Key"
-msgstr "SILC 私钥"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9814,91 +10009,93 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: src/protocols/silc/silc.c:1574
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: src/protocols/silc/silc.c:1576
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: src/protocols/silc/silc.c:1596
+#: src/protocols/silc/silc.c:1610
+#, fuzzy
+msgid "Public Key file"
+msgstr "公钥文件"
+
+#: src/protocols/silc/silc.c:1614
+#, fuzzy
+msgid "Private Key file"
+msgstr "私钥文件"
+
+#: src/protocols/silc/silc.c:1617
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: src/protocols/silc/silc.c:1602
-msgid "Public Key File"
-msgstr "公钥文件"
-
-#: src/protocols/silc/silc.c:1606
-msgid "Private Key File"
-msgstr "私钥文件"
-
-#: src/protocols/silc/silc.c:1611
+#: src/protocols/silc/silc.c:1621
 msgid "Reject watching by other users"
 msgstr "拒绝其他用户监视"
 
-#: src/protocols/silc/silc.c:1614
+#: src/protocols/silc/silc.c:1624
 msgid "Block invites"
 msgstr "屏蔽邀请"
 
-#: src/protocols/silc/silc.c:1617
+#: src/protocols/silc/silc.c:1627
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1630
 msgid "Reject online status attribute requests"
 msgstr "拒绝在线状态属性请求"
 
-#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:310
+#: src/protocols/silc/util.c:313
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: src/protocols/silc/util.c:312
+#: src/protocols/silc/util.c:315
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: src/protocols/silc/util.c:314
+#: src/protocols/silc/util.c:317
 #, c-format
 msgid "EMail: \t\t%s\n"
 msgstr "电子邮件:\t%s\n"
 
-#: src/protocols/silc/util.c:316
+#: src/protocols/silc/util.c:319
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: src/protocols/silc/util.c:318
+#: src/protocols/silc/util.c:321
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: src/protocols/silc/util.c:320
+#: src/protocols/silc/util.c:323
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: src/protocols/silc/util.c:324
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: src/protocols/silc/util.c:322
+#: src/protocols/silc/util.c:325
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: src/protocols/silc/util.c:324
+#: src/protocols/silc/util.c:327
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9909,7 +10106,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:325
+#: src/protocols/silc/util.c:328
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9918,135 +10115,135 @@
 "公钥漏印:\n"
 "%s"
 
-#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: src/protocols/silc/util.c:512
+#: src/protocols/silc/util.c:515
 msgid "Paging"
 msgstr "寻呼"
 
-#: src/protocols/silc/util.c:536
+#: src/protocols/silc/util.c:539
 msgid "Computer"
 msgstr "计算机"
 
-#: src/protocols/silc/util.c:540
+#: src/protocols/silc/util.c:543
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:542
+#: src/protocols/silc/util.c:545
 msgid "Terminal"
 msgstr "终端"
 
-#: src/protocols/toc/toc.c:138
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:199
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名: %s"
 
-#: src/protocols/toc/toc.c:481
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:484
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:487
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败: %s。"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:552
 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."
@@ -10054,37 +10251,42 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误: %s。"
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息: %s"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:584
+#, fuzzy
+msgid "Invalid Groupname"
+msgstr "无效的组"
+
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:617
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:696
+#: src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:899
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:904
+#: src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10094,43 +10296,43 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1432
+#: src/protocols/toc/toc.c:1522
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1572
+#: src/protocols/toc/toc.c:1662
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/toc/toc.c:1784
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1730
+#: src/protocols/toc/toc.c:1820
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1775 src/protocols/toc/toc.c:1815
-#: src/protocols/toc/toc.c:1939 src/protocols/toc/toc.c:2027
+#: src/protocols/toc/toc.c:1865 src/protocols/toc/toc.c:1905
+#: src/protocols/toc/toc.c:2029 src/protocols/toc/toc.c:2117
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1972
+#: src/protocols/toc/toc.c:2062
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:2072
+#: src/protocols/toc/toc.c:2162
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2106
+#: src/protocols/toc/toc.c:2196
 #, 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:2113
+#: src/protocols/toc/toc.c:2203
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -10145,15 +10347,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2200 src/protocols/toc/toc.c:2202
+#: src/protocols/toc/toc.c:2290 src/protocols/toc/toc.c:2292
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2221
+#: src/protocols/toc/toc.c:2311
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2225
+#: src/protocols/toc/toc.c:2315
 msgid "TOC port"
 msgstr "TOC 端口"
 
@@ -10218,11 +10420,11 @@
 msgid "Visit Homepage"
 msgstr "浏览主页"
 
-#: src/protocols/trepia/trepia.c:823 src/protocols/trepia/trepia.c:826
+#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
 msgid "Local Users"
 msgstr "本地用户"
 
-#: src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1032
 msgid "Logging in"
 msgstr "登入"
 
@@ -10236,46 +10438,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1279 src/protocols/trepia/trepia.c:1281
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:140
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
-msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
-
-#: src/protocols/yahoo/yahoo.c:625
+#: src/protocols/yahoo/yahoo.c:711
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:644 src/protocols/yahoo/yahoo.c:3201
+#: src/protocols/yahoo/yahoo.c:735 src/protocols/yahoo/yahoo.c:3305
 msgid "Buzz!!"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:689
+msgstr "呼叫"
+
+#: src/protocols/yahoo/yahoo.c:780
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: src/protocols/yahoo/yahoo.c:756
+#: src/protocols/yahoo/yahoo.c:847
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s 拒绝您将他/她加入好友。"
 
-#: src/protocols/yahoo/yahoo.c:759
+#: src/protocols/yahoo/yahoo.c:850
 #, 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:762
+#: src/protocols/yahoo/yahoo.c:853
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: src/protocols/yahoo/yahoo.c:1514
+#: src/protocols/yahoo/yahoo.c:1605
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10285,11 +10481,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
 "请检查 %s 上的更新。"
 
-#: src/protocols/yahoo/yahoo.c:1517
+#: src/protocols/yahoo/yahoo.c:1608
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: src/protocols/yahoo/yahoo.c:1590
+#: src/protocols/yahoo/yahoo.c:1681
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10297,19 +10493,19 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: src/protocols/yahoo/yahoo.c:1593
+#: src/protocols/yahoo/yahoo.c:1684
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: src/protocols/yahoo/yahoo.c:1627
+#: src/protocols/yahoo/yahoo.c:1718
 msgid "Invalid username."
 msgstr "用户名无效。"
 
-#: src/protocols/yahoo/yahoo.c:1638
+#: src/protocols/yahoo/yahoo.c:1729
 msgid "Normal authentication failed!"
 msgstr "普通认证失败!"
 
-#: src/protocols/yahoo/yahoo.c:1639
+#: src/protocols/yahoo/yahoo.c:1730
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10320,95 +10516,95 @@
 "法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
 "特性。"
 
-#: src/protocols/yahoo/yahoo.c:1647
+#: src/protocols/yahoo/yahoo.c:1738
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: src/protocols/yahoo/yahoo.c:1650
+#: src/protocols/yahoo/yahoo.c:1741
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: src/protocols/yahoo/yahoo.c:1653
+#: src/protocols/yahoo/yahoo.c:1744
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1798
 #, 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:1710
+#: src/protocols/yahoo/yahoo.c:1801
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: src/protocols/yahoo/yahoo.c:1944 src/protocols/yahoo/yahoo.c:2090
+#: src/protocols/yahoo/yahoo.c:2039 src/protocols/yahoo/yahoo.c:2185
 #: src/protocols/yahoo/ycht.c:415
 msgid "Unable to read"
 msgstr "无法读取"
 
-#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2229
-#: src/protocols/yahoo/yahoo.c:2313 src/protocols/yahoo/yahoo.c:2323
-#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
+#: 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/ycht.c:519
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/yahoo/yahoo.c:2937
+#: src/protocols/yahoo/yahoo.c:2521 src/protocols/yahoo/yahoo.c:3036
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2428 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:2523 src/protocols/yahoo/yahoo.c:3039
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:2430 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:2525 src/protocols/yahoo/yahoo.c:3042
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:2434 src/protocols/yahoo/yahoo.c:2949
+#: src/protocols/yahoo/yahoo.c:2529 src/protocols/yahoo/yahoo.c:3048
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:2438 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2533 src/protocols/yahoo/yahoo.c:3054
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:2519 src/protocols/yahoo/yahoo.c:2545
+#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2640
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: src/protocols/yahoo/yahoo.c:2624
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: src/protocols/yahoo/yahoo.c:2629
+#: src/protocols/yahoo/yahoo.c:2724
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: src/protocols/yahoo/yahoo.c:2680
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:2689
+#: src/protocols/yahoo/yahoo.c:2784
 msgid "Join who in chat?"
 msgstr "将谁加入聊天?"
 
-#: src/protocols/yahoo/yahoo.c:2699
+#: src/protocols/yahoo/yahoo.c:2794
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/yahoo/yahoo.c:2798
 msgid "Join user in chat..."
 msgstr "在聊天中加入用户..."
 
-#: src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/yahoo/yahoo.c:3348
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3249
+#: src/protocols/yahoo/yahoo.c:3352
 msgid "buzz: Buzz a contact to get their attention"
-msgstr ""
+msgstr "buzz: 呼叫联系人,以便引起他的注意"
 
 #. *< type
 #. *< ui_requirement
@@ -10420,55 +10616,99 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3329 src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3432 src/protocols/yahoo/yahoo.c:3434
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:3350
+#: src/protocols/yahoo/yahoo.c:3453
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: src/protocols/yahoo/yahoo.c:3353
+#: src/protocols/yahoo/yahoo.c:3456
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3356
+#: src/protocols/yahoo/yahoo.c:3459
 msgid "Japan Pager host"
 msgstr "日本寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:3359
+#: src/protocols/yahoo/yahoo.c:3462
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/yahoo/yahoo.c:3362
+#: src/protocols/yahoo/yahoo.c:3465
 msgid "File transfer host"
 msgstr "文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3365
+#: src/protocols/yahoo/yahoo.c:3468
 msgid "Japan File transfer host"
 msgstr "日本文件传送主机"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3471
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3474
 msgid "Chat Room List Url"
 msgstr "聊天房间列表 URL"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3477
 msgid "YCHT Host"
 msgstr "YCHT 主机"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3480
 msgid "YCHT Port"
 msgstr "YCHT 端口"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:171
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
-msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
+#: src/protocols/yahoo/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
@@ -10556,143 +10796,93 @@
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
-#: src/protocols/yahoo/yahoochat.c:190
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-#: src/protocols/yahoo/yahoochat.c:192
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
-
-#: src/protocols/yahoo/yahoochat.c:344
-msgid "Failed to join chat"
-msgstr "加入聊天失败"
-
-#: src/protocols/yahoo/yahoochat.c:344
-msgid "Maybe the room is full?"
-msgstr "可能房间已满?"
-
-#: src/protocols/yahoo/yahoochat.c:422
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您现在正在 %s 中聊天。"
-
-#: src/protocols/yahoo/yahoochat.c:576
-msgid "Failed to join buddy in chat"
-msgstr "在聊天中加入好友失败"
-
-#: src/protocols/yahoo/yahoochat.c:577
-msgid "Maybe they're not in a chat?"
-msgstr "可能他们未在聊天中?"
-
-#: src/protocols/yahoo/yahoochat.c:1312
-msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
-
-#: src/protocols/yahoo/yahoochat.c:1358
-msgid "Voices"
-msgstr "语音"
-
-#: src/protocols/yahoo/yahoochat.c:1361
-msgid "Webcams"
-msgstr "摄像头"
-
-#: src/protocols/yahoo/yahoochat.c:1372 src/protocols/yahoo/yahoochat.c:1433
-msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
-
-#: src/protocols/yahoo/yahoochat.c:1426
-msgid "User Rooms"
-msgstr "用户房间"
-
 #: src/protocols/yahoo/ycht.c:402
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
 
-#: src/protocols/zephyr/zephyr.c:329
+#: src/protocols/zephyr/zephyr.c:332
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/zephyr/zephyr.c:677
+#: src/protocols/zephyr/zephyr.c:680
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1127
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:717 src/protocols/zephyr/zephyr.c:1132
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:722 src/protocols/zephyr/zephyr.c:1134
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1465 src/protocols/zephyr/zephyr.c:1466
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:2239
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: src/protocols/zephyr/zephyr.c:2245
+#: src/protocols/zephyr/zephyr.c:2291
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: src/protocols/zephyr/zephyr.c:2251
+#: src/protocols/zephyr/zephyr.c:2297
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: src/protocols/zephyr/zephyr.c:2262
+#: src/protocols/zephyr/zephyr.c:2308
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: src/protocols/zephyr/zephyr.c:2568
+#: src/protocols/zephyr/zephyr.c:2614
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2573
+#: src/protocols/zephyr/zephyr.c:2619
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: src/protocols/zephyr/zephyr.c:2578
+#: src/protocols/zephyr/zephyr.c:2624
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2583
+#: src/protocols/zephyr/zephyr.c:2629
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2588
+#: src/protocols/zephyr/zephyr.c:2634
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: src/protocols/zephyr/zephyr.c:2594
+#: src/protocols/zephyr/zephyr.c:2640
 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:2599
+#: src/protocols/zephyr/zephyr.c:2645
 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:2605
+#: src/protocols/zephyr/zephyr.c:2651
 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:2611
+#: src/protocols/zephyr/zephyr.c:2657
 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;"
@@ -10700,7 +10890,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: src/protocols/zephyr/zephyr.c:2663
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10708,15 +10898,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: src/protocols/zephyr/zephyr.c:2668
 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:2728
+#: src/protocols/zephyr/zephyr.c:2774
 msgid "Resubscribe"
 msgstr "重订"
 
-#: src/protocols/zephyr/zephyr.c:2731
+#: src/protocols/zephyr/zephyr.c:2777
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10730,56 +10920,70 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2814 src/protocols/zephyr/zephyr.c:2816
+#: src/protocols/zephyr/zephyr.c:2860 src/protocols/zephyr/zephyr.c:2862
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/protocols/zephyr/zephyr.c:2841
+#: src/protocols/zephyr/zephyr.c:2887
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2844
+#: src/protocols/zephyr/zephyr.c:2890
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2847
+#: src/protocols/zephyr/zephyr.c:2893
 msgid "Import from .anyone"
 msgstr "从 .anyone 导入"
 
-#: src/protocols/zephyr/zephyr.c:2850
+#: src/protocols/zephyr/zephyr.c:2896
 msgid "Import from .zephyr.subs"
 msgstr "从 .zephyr.subs 导入"
 
-#: src/protocols/zephyr/zephyr.c:2853
+#: src/protocols/zephyr/zephyr.c:2899
 msgid "Realm"
 msgstr "域"
 
-#: src/protocols/zephyr/zephyr.c:2856
+#: src/protocols/zephyr/zephyr.c:2902
 msgid "Exposure"
 msgstr "暴露"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:988
+#: src/proxy.c:1038
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
 
-#: src/proxy.c:992
+#: src/proxy.c:1042
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理服务器连接错误 %d"
 
-#: src/proxy.c:1820
+#: src/proxy.c:1876
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: src/proxy.c:1820
+#: src/proxy.c:1876
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "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.
 #.
@@ -10787,40 +10991,38 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:62
-msgid "Please enter your password"
-msgstr "请输入您的密码"
-
-#: src/server.c:471
+#: 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:895
+#: src/server.c:743
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 条消息)"
 
-#: src/server.c:909
+#: src/server.c:757
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1166
+#: src/server.c:1013
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
-"<b>%s</b>"
-msgstr ""
-"%s 邀请了 %s 加入聊天室 %s:\n"
-"<b>%s</b>"
-
-#: src/server.c:1172
+"%s"
+msgstr "%s 邀请了 %s 加入聊天室 %s:\n%s"
+
+#: src/server.c:1018
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: src/server.c:1178
+#: src/server.c:1024
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
@@ -10828,70 +11030,160 @@
 msgid "Unset"
 msgstr "取消设置"
 
-#: src/status.c:614
+#: src/status.c:621
 #, c-format
 msgid "%s came back"
 msgstr "%s 回来了"
 
-#: src/status.c:619
+#: src/status.c:626
 #, c-format
 msgid "%s went away"
 msgstr "%s 走了"
 
-#: src/status.c:1314
+#: src/status.c:1276
 #, c-format
 msgid "%s became idle"
 msgstr "%s 打起瞌睡"
 
-#: src/status.c:1330
+#: src/status.c:1292
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 睡醒了"
 
-#: src/util.c:2128
+#: src/util.c:2106
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"
 
-#: src/util.c:2129
+#: src/util.c:2107
 #, 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:2566
+#: src/util.c:2544
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/util.c:2569
+#: src/util.c:2547
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2599
+#: src/util.c:2577
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 
-#: src/util.c:2613
+#: src/util.c:2591
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:2621
+#: src/util.c:2599
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: src/util.c:2629
+#: src/util.c:2607
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:3049
+#: src/util.c:3027
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接出错。\n"
 
+#~ msgid "Mail Server"
+#~ msgstr "邮件服务器"
+
+#~ msgid "%s (%d new/%d total)"
+#~ msgstr "%s (%d 封新邮件/共 %d 封)"
+
+#~ msgid "Check Mail"
+#~ msgstr "检查邮件"
+
+#~ msgid "Check email every X seconds.\n"
+#~ msgstr "每隔 X 秒检查邮件。\n"
+
+#~ msgid "Auto-login"
+#~ msgstr "自动登录"
+
+#~ msgid "Unable to send messge to %s."
+#~ msgstr "无法给 %s 发送消息。"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>瞌睡</b>"
+
+#~ msgid "former lead developer"
+#~ msgstr "先前领导开发者"
+
+#~ msgid "former maintainer"
+#~ msgstr "先前维护者"
+
+#~ msgid "Chinese"
+#~ msgstr "中文"
+
+#~ msgid "Unable to load preferences"
+#~ msgstr "无法装入首选项"
+
+#~ msgid ""
+#~ "Gaim was not able to load your preferences because they are stored in an "
+#~ "old format that is no longer used.  Please reconfigure your settings "
+#~ "using the Preferences window."
+#~ msgstr ""
+#~ "Gaim 无法装入您的首选项,原因是存储首选项所用的的格式太老,目前已不支持。"
+#~ "请使用首选项窗口重新配置您的设置。"
+
+#~ msgid "if (away && idle)"
+#~ msgstr "如果离开且瞌睡"
+
+#~ msgid "The user %s wants to add you to their buddy list."
+#~ msgstr "用户 %s 想要将您添加为好友。"
+
+#~ msgid ""
+#~ "You were disconnected from the server, because you logged on from a "
+#~ "different location"
+#~ msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
+
+#~ msgid ""
+#~ "You have been disconnected because you have signed on with this screen "
+#~ "name at another location."
+#~ msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
+
+#~ msgid "Default SILC Key Pair"
+#~ msgstr "默认 SILC 密钥对"
+
+#~ msgid "SILC Public Key"
+#~ msgstr "SILC 公钥"
+
+#~ msgid "SILC Private Key"
+#~ msgstr "SILC 私钥"
+
+#~ msgid ""
+#~ "You have been logged off as you have logged in on a different machine or "
+#~ "device."
+#~ msgstr "您已被注销,因为您已从其它计算机或设备上登录。"
+
+#~ msgid ""
+#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+#~ "(1,048,576 bytes)."
+#~ msgstr "Gaim 无法通过雅虎发送超过 1 兆(1 048 576 字节)的文件。"
+
+#~ msgid "Please enter your password"
+#~ msgstr "请输入您的密码"
+
+#~ msgid ""
+#~ "%s has invited %s to the chat room %s:\n"
+#~ "<b>%s</b>"
+#~ msgstr ""
+#~ "%s 邀请了 %s 加入聊天室 %s:\n"
+#~ "<b>%s</b>"
+
 #~ msgid "Log Out"
 #~ msgstr "登出"
 
@@ -10901,9 +11193,6 @@
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "/好友(B)/登出"
 
-#~ msgid "_Screen name"
-#~ msgstr "用户名(_S)"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "文件传送中止"