diff po/zh_CN.po @ 5360:ba459635b075

[gaim-migrate @ 5736] Morten Brix Pedersen (mbrix) updated the danish translation and Wang (fundawang) updated the zh_CN(Simplified Chinese) translation. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 12 May 2003 15:10:47 +0000
parents 6aa785e55d0f
children 88b5c9a45075
line wrap: on
line diff
--- a/po/zh_CN.po	Mon May 12 15:02:51 2003 +0000
+++ b/po/zh_CN.po	Mon May 12 15:10:47 2003 +0000
@@ -1,4 +1,4 @@
-#zh_CN.po # SOME DESCRIPTIVE TITLE.
+# gaim 软件包的简体中文翻译。
 # Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gaim package.
 # Funda Wang <fundawang@en2china.com>, 2003.
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-04-29 13:12+0800\n"
-"PO-Revision-Date: 2003-05-06 03:45+0800\n"
+"POT-Creation-Date: 2003-05-12 17:00+0800\n"
+"PO-Revision-Date: 2003-05-11 21:32+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,60 +15,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:95 src/multi.c:284 src/win32/systray.c:296
+#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:296
 msgid "Auto-login"
 msgstr "自动登录"
 
+#: plugins/docklet/docklet.c:97
+msgid "New Message.."
+msgstr "新消息..."
+
 #: plugins/docklet/docklet.c:98
-msgid "New Message.."
-msgstr "新消息..."
-
-#: plugins/docklet/docklet.c:99
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:130
+#: plugins/docklet/docklet.c:129
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:134 src/protocols/gg/gg.c:71
-#: src/protocols/jabber/jabber.c:1161 src/protocols/jabber/jabber.c:3356
-#: src/protocols/jabber/jabber.c:3410 src/protocols/oscar/oscar.c:2698
-#: src/protocols/oscar/oscar.c:4347 src/protocols/oscar/oscar.c:5216
-#: src/protocols/oscar/oscar.c:5533 src/buddy.c:1289 src/gtkpounce.c:500
-#: src/prefs.c:1057
+#: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
+#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:3487 src/protocols/jabber/jabber.c:3541
+#: src/protocols/oscar/oscar.c:2790 src/protocols/oscar/oscar.c:4466
+#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5689
+#: src/gtkblist.c:1488 src/gtkpounce.c:564 src/prefs.c:1072
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:140 src/away.c:518
+#: plugins/docklet/docklet.c:139 src/away.c:530
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:148
+#: plugins/docklet/docklet.c:147
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:153
+#: plugins/docklet/docklet.c:152
 msgid "File Transfers..."
 msgstr "文件传送..."
 
-#: plugins/docklet/docklet.c:154
+#: plugins/docklet/docklet.c:153
 msgid "Accounts..."
 msgstr "账户..."
 
-#: plugins/docklet/docklet.c:155
+#: plugins/docklet/docklet.c:154
 msgid "Preferences..."
 msgstr "首选项..."
 
-#: plugins/docklet/docklet.c:164 src/win32/systray.c:119
+#: plugins/docklet/docklet.c:163 src/win32/systray.c:119
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:168
+#: plugins/docklet/docklet.c:167
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:443
+#: plugins/docklet/docklet.c:451
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
@@ -76,15 +76,30 @@
 #. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
 #. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
 #. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:452
+#: plugins/docklet/docklet.c:460
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
-#: plugins/docklet/docklet.c:464 plugins/docklet/docklet.c:473
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:484
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
-#: plugins/docklet/docklet.c:466 plugins/docklet/docklet.c:477
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:487
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "在系统托盘中显示 Gaim 的图标。"
+
+#. *  description
+#: plugins/docklet/docklet.c:489
 msgid ""
 "Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -95,68 +110,24 @@
 "能,以及切换好友列表或登录窗口的显示。同时,与 ICQ 类似,还可以将消息存入队"
 "列。"
 
-#: plugins/autorecon.c:58
-msgid "Autoreconnect"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/autorecon.c:85
+msgid "Auto-Reconnect"
 msgstr "自动重连"
 
-#: plugins/autorecon.c:60 plugins/autorecon.c:71
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/autorecon.c:88 plugins/autorecon.c:90
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
-#: plugins/autorecon.c:67
-msgid "Auto Reconnect"
-msgstr "自动重连"
-
-#: plugins/chatlist.c:74 src/buddy_chat.c:268
-msgid "Buddy Chat"
-msgstr "好友聊天"
-
-#: plugins/chatlist.c:162 plugins/chatlist.c:164 plugins/chatlist.c:347
-#: plugins/chatlist.c:349
-msgid "Gaim Chat"
-msgstr "Gaim 聊天"
-
-#: plugins/chatlist.c:305
-msgid "Chat Rooms"
-msgstr "聊天室"
-
-#: plugins/chatlist.c:316
-msgid "Refresh"
-msgstr "刷新"
-
-#: plugins/chatlist.c:317 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2541 src/dialogs.c:2163 src/gtkconv.c:795
-#: src/gtkconv.c:2632 src/gtkconv.c:3770 src/prpl.c:753
-msgid "Add"
-msgstr "添加"
-
-#: plugins/chatlist.c:318 src/gtkconv.c:793 src/gtkconv.c:2638
-#: src/gtkconv.c:3761
-msgid "Remove"
-msgstr "删除"
-
-#: plugins/chatlist.c:330
-msgid "List of available chats"
-msgstr "进行中的聊天"
-
-#: plugins/chatlist.c:339
-msgid "List of subscribed chats"
-msgstr "已订阅的聊天"
-
-#: plugins/chatlist.c:400 plugins/chatlist.c:410
-msgid "Chat List"
-msgstr "聊天列表"
-
-#: plugins/chatlist.c:402
-msgid "Allows you to add chat rooms to your buddy list."
-msgstr "允许您将聊天室添加到您的好友列表。"
-
-#: plugins/chatlist.c:415
-msgid ""
-"Allows you to add chat rooms to your buddy list. Click the configure button "
-"to choose which rooms."
-msgstr "允许您将聊天室添加到您的好友列表中。单击配置按钮可以选择哪些聊天室。"
-
 #: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
 msgid "Mail Server"
 msgstr "邮件服务器"
@@ -174,6 +145,73 @@
 msgid "Check email every X seconds.\n"
 msgstr "每隔 X 秒检查邮件。\n"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/events.c:225
+msgid "Event Test"
+msgstr "事件测试"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/events.c:228 plugins/events.c:230
+msgid "Test to see that all events are working properly."
+msgstr "测试看看所有的事件是否都工作正确。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/filectl.c:203
+msgid "Gaim File Control"
+msgstr "Gaim 文件控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/filectl.c:206 plugins/filectl.c:208
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "允许您输入文件中的命令来控制 Gaim。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:72
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim 演示插件"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:75
+msgid "An example plugin that does stuff - see the description."
+msgstr "一个范例插件 - 参看描述。"
+
+#. *  description
+#: plugins/gaiminc.c:77
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"这个插件非常酷,它可以完成以下功能:\n"
+"- 在您登入后告诉您谁写的这个程序\n"
+"- 颠倒所有收到的文本\n"
+"- 当您的好友登入后立即给他们发送信息"
+
 #: plugins/gtik.c:719
 msgid "Gnome Stock Ticker Properties"
 msgstr "Gnome 股票机属性"
@@ -203,156 +241,234 @@
 msgid "Change"
 msgstr "变化"
 
-#: plugins/history.c:76
+#: plugins/history.c:79
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:78
-msgid "Shows recently logged conversations in new conversations "
-msgstr "在新对话框中显示显示最近记录的对话"
-
-#: plugins/iconaway.c:68 plugins/iconaway.c:77
-msgid "Iconify on away"
+#: plugins/history.c:81
+msgid "Shows recently logged conversations in new conversations."
+msgstr "在新对话中显示显示最近记录的对话。"
+
+#: plugins/history.c:82
+msgid ""
+"When a new conversation is opened this plugin will insert the last XXX of "
+"the last conversation into the current conversation."
+msgstr "打开新对话时,此插件将会将上次对话的指定内容插入当前对话。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:75
+msgid "Iconify on Away"
 msgstr "离开后变为图标"
 
-#: plugins/iconaway.c:70 plugins/iconaway.c:81
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/iconaway.c:78 plugins/iconaway.c:80
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr "您离开后将离开框和好友列表都变为图标。"
 
-#: plugins/idle.c:19 plugins/idle.c:81
-msgid "I'dle Mak'er"
-msgstr "瞌睡虫"
-
-#: plugins/idle.c:23 plugins/idle.c:83
-msgid "Allows you to hand-configure how long you've been idle for"
-msgstr "允许您手动配置您睡了多长时间"
-
-#: plugins/idle.c:99
+#: plugins/idle.c:78 src/protocols/irc/irc.c:951
 msgid "Idle Time"
 msgstr "瞌睡时间"
 
-#: plugins/idle.c:107
+#: plugins/idle.c:86
 msgid "Set"
 msgstr "设置"
 
-#: plugins/idle.c:112
+#: plugins/idle.c:91
 msgid "idle for"
 msgstr "打瞌睡"
 
-#: plugins/idle.c:119 plugins/timestamp.c:86
+#: plugins/idle.c:98 plugins/timestamp.c:86
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/idle.c:125
+#: plugins/idle.c:104
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/notify.c:440
+#: plugins/idle.c:127
+msgid "I'dle Mak'er"
+msgstr "瞌睡虫"
+
+#: plugins/idle.c:129 plugins/idle.c:130
+msgid "Allows you to hand-configure how long you've been idle for"
+msgstr "允许您手动配置您睡了多长时间"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/mailchk.c:149
+msgid "Mail Checker"
+msgstr "邮件检查器"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/mailchk.c:152 plugins/mailchk.c:154
+msgid "Checks for new local mail."
+msgstr "检查新的本地邮件。"
+
+#: plugins/notify.c:439
 msgid "Unable to write to config file"
 msgstr "无法写入配置文件"
 
-#: plugins/notify.c:440
+#: plugins/notify.c:439
 msgid "Notify plugin"
 msgstr "通知插件"
 
-#: plugins/notify.c:598 plugins/notify.c:607
-msgid "Message Notification"
-msgstr "消息通知"
-
-#: plugins/notify.c:600 plugins/notify.c:611
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有未读消息。"
-
-#: plugins/notify.c:621
+#: plugins/notify.c:569
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:570
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:627
+#: plugins/notify.c:575
 msgid "_Chat windows"
 msgstr "聊天窗口(_C)"
 
 #. --------------
-#: plugins/notify.c:633
+#: plugins/notify.c:581
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:636
+#: plugins/notify.c:584
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "在窗口标题前追加字符串(按回车保存)(_S):"
 
-#: plugins/notify.c:647
+#: plugins/notify.c:595
 msgid "_Quote window title"
 msgstr "引用窗口标题(_Q)"
 
-#: plugins/notify.c:652
+#: plugins/notify.c:600
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#: plugins/notify.c:657
+#: plugins/notify.c:605
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
-#: plugins/notify.c:662
+#: plugins/notify.c:610
 msgid "_Notify even if conversation is in focus"
 msgstr "即使正处于对话中也通知(_N)"
 
 #. --------------
-#: plugins/notify.c:668
+#: plugins/notify.c:616
 msgid "Notification Removal"
 msgstr "通知删除"
 
-#: plugins/notify.c:669
+#: plugins/notify.c:617
 msgid "Remove when conversation window gains _focus"
 msgstr "对话窗口获得焦点后即删除(_F)"
 
-#: plugins/notify.c:674
+#: plugins/notify.c:622
 msgid "Remove when conversation window _receives click"
-msgstr "单机对话窗口后即删除(_R)"
-
-#: plugins/notify.c:679
+msgstr "单击对话窗口后即删除(_R)"
+
+#: plugins/notify.c:627
 msgid "Remove when _typing in conversation window"
-msgstr "在对话窗口中打字后删除(_T)"
-
-#: plugins/notify.c:684
+msgstr "在对话窗口中打字后即删除(_T)"
+
+#: plugins/notify.c:632
 msgid "Appl_y"
 msgstr "应用(_Y)"
 
-#: plugins/spellchk.c:399 plugins/spellchk.c:408
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/notify.c:695
+msgid "Message Notification"
+msgstr "邮件通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/notify.c:698 plugins/notify.c:700
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "提供各种方法通知您有未读邮件。"
+
+#: plugins/raw.c:152
+msgid "Raw"
+msgstr "Raw"
+
+#: plugins/raw.c:154
+msgid "Lets you send raw input to text-vased protocols."
+msgstr "允许您发送原样输入基于文本的协议。"
+
+#: plugins/raw.c:155
+msgid ""
+"Lets you send raw input to text-vased protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
+"键可以发送。看看调试窗口。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/simple.c:30
+msgid "Simple Plugin"
+msgstr "简单插件"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/simple.c:33 plugins/simple.c:35
+msgid "Tests to see that most things are working."
+msgstr "测试看看大多数功能是否正常。"
+
+#: plugins/spellchk.c:411
+msgid "Text Replacements"
+msgstr "文字替换"
+
+#: plugins/spellchk.c:435
+msgid "You type"
+msgstr "输入文字"
+
+#: plugins/spellchk.c:447
+msgid "You send"
+msgstr "送出文字"
+
+#: plugins/spellchk.c:473
+msgid "Add a new text replacement"
+msgstr "添加新的文字替换"
+
+#: plugins/spellchk.c:480
+msgid "You _type:"
+msgstr "输入文字(_T):"
+
+#: plugins/spellchk.c:494
+msgid "You _send:"
+msgstr "送出文字(_S):"
+
+#: plugins/spellchk.c:534
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:401 plugins/spellchk.c:412
+#: plugins/spellchk.c:536 plugins/spellchk.c:537
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
-#: plugins/spellchk.c:429
-msgid "Text Replacements"
-msgstr "文字替换"
-
-#: plugins/spellchk.c:453
-msgid "You type"
-msgstr "输入文字"
-
-#: plugins/spellchk.c:465
-msgid "You send"
-msgstr "送出文字"
-
-#: plugins/spellchk.c:491
-msgid "Add a new text replacement"
-msgstr "添加新的文字替换"
-
-#: plugins/spellchk.c:498
-msgid "You _type:"
-msgstr "输入文字(_T):"
-
-#: plugins/spellchk.c:512
-msgid "You _send:"
-msgstr "送出文字(_S):"
-
 #: plugins/timestamp.c:72
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
@@ -365,37 +481,62 @@
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: plugins/timestamp.c:129
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/timestamp.c:145
 msgid "Timestamp"
 msgstr "时间戳"
 
-#: plugins/timestamp.c:131
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/timestamp.c:148 plugins/timestamp.c:150
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:213
+#: plugins/gestures/gestures.c:210
 msgid "Mouse Gestures Configuration"
 msgstr "鼠标手势配置"
 
-#: plugins/gestures/gestures.c:220
+#: plugins/gestures/gestures.c:217
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
-#: plugins/gestures/gestures.c:225
+#: plugins/gestures/gestures.c:222
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:237
+#: plugins/gestures/gestures.c:234
 msgid "_Visual gesture display"
 msgstr "可视手势显示(_V)"
 
-#: plugins/gestures/gestures.c:253 plugins/gestures/gestures.c:272
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gestures/gestures.c:261
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
-#: plugins/gestures/gestures.c:256 plugins/gestures/gestures.c:278
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gestures/gestures.c:264
+msgid "Provides support for mouse gestures"
+msgstr "提供鼠标手势的支持"
+
+#. *  description
+#: plugins/gestures/gestures.c:266
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -411,28 +552,72 @@
 "向上再向左可切换到上个对话。\n"
 "向上再向右可切换到下个对话。"
 
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:240
-#: plugins/ticker/ticker.c:272
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:283
 msgid "Buddy Ticker"
-msgstr "好友发报器"
-
-#: plugins/ticker/ticker.c:244 plugins/ticker/ticker.c:274
+msgstr "好友点点通"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ticker/ticker.c:286 plugins/ticker/ticker.c:288
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
 #: plugins/win32/transparency/win2ktrans.c:123
-#: plugins/win32/transparency/win2ktrans.c:432
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:412
+#: plugins/win32/transparency/win2ktrans.c:446
 msgid "Opacity:"
 msgstr "不透明度:"
 
-#: plugins/win32/transparency/win2ktrans.c:385
+#. IM Convo trans options
+#: plugins/win32/transparency/win2ktrans.c:393
+msgid "IM Conversation Windows"
+msgstr "即时消息对话窗口"
+
 #: plugins/win32/transparency/win2ktrans.c:394
+msgid "_IM window transparency"
+msgstr "即时消息窗口透明度(_I)"
+
+#: plugins/win32/transparency/win2ktrans.c:404
+msgid "_Show slider bar in IM window"
+msgstr "在即时消息窗口中显示滑块(_S)"
+
+#. Buddy List trans options
+#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:586
+msgid "Buddy List Window"
+msgstr "好友列表窗口"
+
+#: plugins/win32/transparency/win2ktrans.c:430
+msgid "_Keep Buddy List window on top"
+msgstr "好友列表窗口常局顶端(_K)"
+
+#: plugins/win32/transparency/win2ktrans.c:433
+msgid "_Buddy List window transparency"
+msgstr "好友列表窗口的透明度(_B)"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/win32/transparency/win2ktrans.c:489
 msgid "Transparency"
 msgstr "透明度"
 
-#: plugins/win32/transparency/win2ktrans.c:387
-#: plugins/win32/transparency/win2ktrans.c:398
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/win32/transparency/win2ktrans.c:492
+#: plugins/win32/transparency/win2ktrans.c:494
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows.\n"
 "\n"
@@ -443,51 +628,68 @@
 "* 注意:此插件需要 Win2000 或 WinXP。"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:413
-msgid "IM Conversation Windows"
-msgstr "即时消息对话窗口"
-
-#: plugins/win32/transparency/win2ktrans.c:414
-msgid "_IM window transparency"
-msgstr "即时消息窗口透明度(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:424
-msgid "_Show slider bar in IM window"
-msgstr "在即时消息窗口中显示滑块(_S)"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:449 src/prefs.c:572
-msgid "Buddy List Window"
-msgstr "好友列表窗口"
-
-#: plugins/win32/transparency/win2ktrans.c:450
-msgid "_Keep Buddy List window on top"
-msgstr "好友列表窗口常局顶端(_K)"
-
-#: plugins/win32/transparency/win2ktrans.c:453
-msgid "_Buddy List window transparency"
-msgstr "好友列表窗口的透明度(_B)"
-
-#: plugins/win32/winprefs/winprefs.c:144 plugins/win32/winprefs/winprefs.c:153
+#: plugins/win32/winprefs/winprefs.c:141
+msgid "Startup"
+msgstr "启动"
+
+#: plugins/win32/winprefs/winprefs.c:142
+msgid "_Start Gaim on Windows startup"
+msgstr "Windows 启动时启动 Gaim(_S)"
+
+#: plugins/win32/winprefs/winprefs.c:170
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:146 plugins/win32/winprefs/winprefs.c:157
+#: plugins/win32/winprefs/winprefs.c:172 plugins/win32/winprefs/winprefs.c:173
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#. IM Convo trans options
-#: plugins/win32/winprefs/winprefs.c:170
-msgid "Startup"
-msgstr "启动"
-
-#: plugins/win32/winprefs/winprefs.c:171
-msgid "_Start Gaim on Windows startup"
-msgstr "Windows 启动时启动 Gaim(_S)"
-
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1169
-#: src/protocols/msn/msn.c:1519 src/protocols/msn/msn.c:1624
-#: src/protocols/yahoo/yahoo.c:1245 src/protocols/yahoo/yahoo.c:1324
+#: plugins/perl/perl.c:395
+msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
+msgstr "GAIM::register 调用参数不对。请参考 PERL-HOWTO。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/perl/perl.c:1376
+msgid "Perl Plugin Loader"
+msgstr "Perl 插件装入器"
+
+#. *< name
+#. *< version
+#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
+msgid "Provides support for loading perl plugins."
+msgstr "提供装入 Perl 插件的支持。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/statenotify.c:68
+msgid "Buddy State Notification"
+msgstr "好友状态通知"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/statenotify.c:71 plugins/statenotify.c:74
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
+
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
+#: src/protocols/msn/away.c:27 src/protocols/msn/away.c:28
+#: src/protocols/msn/away.c:35 src/protocols/msn/away.c:36
+#: src/protocols/msn/msn.c:124 src/protocols/yahoo/yahoo.c:1269
+#: src/protocols/yahoo/yahoo.c:1348
 msgid "Available"
 msgstr "可用"
 
@@ -499,11 +701,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3359
-#: src/protocols/jabber/jabber.c:3422 src/protocols/oscar/oscar.c:2702
-#: src/protocols/oscar/oscar.c:4335 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:5538 src/protocols/yahoo/yahoo.c:1062
-#: src/protocols/yahoo/yahoo.c:1267 src/protocols/yahoo/yahoo.c:1334
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3490
+#: src/protocols/jabber/jabber.c:3553 src/protocols/oscar/oscar.c:2794
+#: src/protocols/oscar/oscar.c:4454 src/protocols/oscar/oscar.c:4481
+#: src/protocols/oscar/oscar.c:5694 src/protocols/yahoo/yahoo.c:1086
+#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
 msgid "Invisible"
 msgstr "隐身"
 
@@ -617,11 +819,11 @@
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4843 src/gtkft.c:1031
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1031
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4843 src/gtkft.c:1032
+#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4990 src/gtkft.c:1032
 msgid "No"
 msgstr "否"
 
@@ -643,7 +845,7 @@
 
 #: src/protocols/gg/gg.c:709 src/protocols/gg/gg.c:712
 msgid "Birth year"
-msgstr "出生年代"
+msgstr "出生年份"
 
 #: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:720
 #: src/protocols/gg/gg.c:722
@@ -651,7 +853,7 @@
 msgstr "性别"
 
 #. Line 5
-#: src/protocols/gg/gg.c:726 src/dialogs.c:1762 src/dialogs.c:2396
+#: src/protocols/gg/gg.c:726 src/dialogs.c:2087 src/dialogs.c:2724
 msgid "City"
 msgstr "城市"
 
@@ -696,8 +898,8 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
-"Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。"
-"请稍后再试一次。"
+"Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
+"一次。"
 
 #: src/protocols/gg/gg.c:990
 msgid "Unable to import Gadu-Gadu buddy list"
@@ -707,9 +909,7 @@
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
-msgstr ""
-"Gaim 无法连接到 Gadu-Gadu 好友列表服务器。"
-"请稍后再试一次。"
+msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
 #: src/protocols/gg/gg.c:1059
 msgid "Couldn't export buddy list"
@@ -718,9 +918,7 @@
 #: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
-msgstr ""
-"Gaim 无法连接到好友列表服务器。"
-"请稍后再试一次。"
+msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
 #: src/protocols/gg/gg.c:1081
 msgid "Unable to delete Gadu-Gadu buddy list"
@@ -734,9 +932,7 @@
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
-msgstr 
-"Gaim 无法搜索目录,原因是无法与目录服务器连接。"
-"请稍后再试一次。"
+msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
 #: src/protocols/gg/gg.c:1162
 msgid "Unable to change Gadu-Gadu password"
@@ -747,16 +943,15 @@
 "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 服务器连接出错。"
-"请稍后再试一次。"
+"Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
 #: src/protocols/gg/gg.c:1177
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4238
-#: src/protocols/oscar/oscar.c:5725 src/protocols/toc/toc.c:1446
-#: src/dialogs.c:1869 src/dialogs.c:1878
+#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4376
+#: src/protocols/oscar/oscar.c:5880 src/protocols/toc/toc.c:1449
+#: src/dialogs.c:2194 src/dialogs.c:2203
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -781,31 +976,41 @@
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
-"Gaim 无法访问用户的配置文件,原因是与目录服务器连接出错。"
-"请稍后再试一次。"
-
-#: src/protocols/gg/gg.c:1323 src/protocols/icq/gaim_icq.c:497
-#: src/protocols/oscar/oscar.c:3764
-msgid "Nick:"
-msgstr "昵称:"
-
-#: src/protocols/gg/gg.c:1324
-msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu 用户"
+"Gaim 无法访问用户的配置文件,原因是与目录服务器连接出错。请稍后再试一次。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/gg/gg.c:1349 src/protocols/gg/gg.c:1351
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu 协议插件"
 
 #: src/protocols/icq/gaim_icq.c:224
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2629
+#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3790
+#: src/prpl.c:706
+msgid "Add"
+msgstr "添加"
+
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1363
-#: src/protocols/oscar/oscar.c:2307 src/protocols/oscar/oscar.c:2367
-#: src/protocols/oscar/oscar.c:5413 src/protocols/toc/toc.c:2041
-#: src/buddy_chat.c:307 src/dialogs.c:458 src/dialogs.c:466 src/dialogs.c:1819
-#: src/dialogs.c:1930 src/dialogs.c:1990 src/dialogs.c:2152 src/dialogs.c:2338
-#: src/dialogs.c:2487 src/dialogs.c:3130 src/dialogs.c:3529 src/dialogs.c:4033
-#: src/dialogs.c:4605 src/gtkft.c:1110 src/multi.c:1468 src/multi.c:1850
-#: src/prpl.c:321 src/prpl.c:753 src/server.c:1065
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1432
+#: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
+#: src/protocols/oscar/oscar.c:5569 src/protocols/toc/toc.c:1979
+#: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
+#: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
+#: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
+#: src/dialogs.c:4431 src/dialogs.c:5004 src/gtkft.c:1110 src/multi.c:1506
+#: src/multi.c:1870 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
 msgid "Cancel"
 msgstr "取消"
 
@@ -814,15 +1019,16 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "用户 %s (%s%s%s%s%s) 需要您的同意。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:518 src/protocols/oscar/oscar.c:2479
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
+#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:602
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1651
-#: src/protocols/msn/msn.c:518 src/protocols/oscar/oscar.c:2479
-#: src/protocols/oscar/oscar.c:4877 src/dialogs.c:2151
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1765
+#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:603
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
+#: src/dialogs.c:2479
 msgid "Deny"
 msgstr "拒绝"
 
@@ -830,10 +1036,10 @@
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2269
-#: src/protocols/jabber/jabber.c:2303 src/protocols/jabber/jabber.c:4156
-#: src/protocols/jabber/jabber.c:4202 src/protocols/msn/msn.c:1182
-#: src/protocols/msn/msn.c:1212
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2385
+#: src/protocols/jabber/jabber.c:2420 src/protocols/jabber/jabber.c:4293
+#: src/protocols/jabber/jabber.c:4340 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:187 src/protocols/msn/notification.c:1152
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -841,855 +1047,979 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3867
+msgid "Nick:"
+msgstr "昵称:"
+
 #: src/protocols/icq/gaim_icq.c:498
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/irc.c:200
+#: src/protocols/irc/irc.c:202
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/irc.c:500 src/protocols/irc/irc.c:2504
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2617
 #, c-format
 msgid "DCC Chat with %s closed"
-msgstr "与 %s 的 DCC 聊天已关闭"
-
-#: src/protocols/irc/irc.c:553 src/protocols/irc/irc.c:2513
+msgstr "与 %s 的二人世界已关闭"
+
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2626
 #, c-format
 msgid "DCC Chat with %s established"
-msgstr "与 %s 的 DCC 聊天已建立"
-
-#: src/protocols/irc/irc.c:687
+msgstr "与 %s 的二人世界已建立"
+
+#: src/protocols/irc/irc.c:691
 msgid "No topic is set"
 msgstr "没有设置话题"
 
-#: src/protocols/irc/irc.c:708 src/protocols/irc/irc.c:1646
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1754
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 已经将话题改为:%s</B>"
 
-#: src/protocols/irc/irc.c:753
+#: src/protocols/irc/irc.c:757
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 模式/%s [%c%c %s] 由 %s"
 
-#. RPL_REHASHING
-#: src/protocols/irc/irc.c:1087
-msgid "Rehashing server"
-msgstr "正在重连服务器"
-
-#: src/protocols/irc/irc.c:1087 src/protocols/irc/irc.c:1539
+#: src/protocols/irc/irc.c:934 src/protocols/irc/irc.c:947
+msgid "User"
+msgstr "用户名"
+
+#: src/protocols/irc/irc.c:938
+msgid "Server"
+msgstr "服务器"
+
+#: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1646
 msgid "IRC Operator"
 msgstr "IRC 管理者"
 
+#: src/protocols/irc/irc.c:955
+msgid "Channels"
+msgstr "频道"
+
+#: src/protocols/irc/irc.c:961
+#, c-format
+msgid "%s is an Identified User"
+msgstr "%s 是标识的用户"
+
+#: src/protocols/irc/irc.c:976
+#, c-format
+msgid "%ld seconds [signon: %s]"
+msgstr "%ld 秒 [登入:%s]"
+
+#. RPL_REHASHING
+#: src/protocols/irc/irc.c:1096
+msgid "Rehashing server"
+msgstr "正在重连服务器"
+
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1090
+#: src/protocols/irc/irc.c:1099
 msgid "No such nick/channel"
 msgstr "没有这样的昵称/频道"
 
-#: src/protocols/irc/irc.c:1090 src/protocols/irc/irc.c:1093
-#: src/protocols/irc/irc.c:1098 src/protocols/irc/irc.c:1101
-#: src/protocols/irc/irc.c:1497
+#: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1110
+#: src/protocols/irc/irc.c:1461 src/protocols/irc/irc.c:1604
 msgid "IRC Error"
 msgstr "IRC 出错"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1093
+#: src/protocols/irc/irc.c:1102
 msgid "No such server"
 msgstr "没有该服务器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1098
+#: src/protocols/irc/irc.c:1107
 msgid "No nickname given"
 msgstr "没有给出昵称"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1101
+#: src/protocols/irc/irc.c:1110
 msgid "You're not an IRC operator!"
 msgstr "您不是 IRC 管理员!"
 
-#: src/protocols/irc/irc.c:1104
+#: src/protocols/irc/irc.c:1113
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "该昵称已经被其他人使用了。请输入新昵称"
 
-#: src/protocols/irc/irc.c:1326 src/protocols/irc/irc.c:1332
-#: src/protocols/irc/irc.c:1338 src/protocols/irc/irc.c:1352
+#: src/protocols/irc/irc.c:1395 src/protocols/irc/irc.c:1401
+#: src/protocols/irc/irc.c:1407 src/protocols/irc/irc.c:1421
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 信息"
 
-#: src/protocols/irc/irc.c:1362
+#: src/protocols/irc/irc.c:1431
 #, c-format
 msgid "%s would like to establish a DCC chat"
-msgstr "%s 想要建立 DCC 聊天"
-
-#: src/protocols/irc/irc.c:1363
+msgstr "%s 想要建立二人世界"
+
+#: src/protocols/irc/irc.c:1432
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr "这需要在两台计算机之间建立直接连接。发送的消息不通过 IRC 服务器"
 
-#: src/protocols/irc/irc.c:1363 src/protocols/oscar/oscar.c:2307
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2387
+#: src/protocols/oscar/oscar.c:5569
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/irc/irc.c:1436 src/protocols/msn/msn.c:151
-#: src/protocols/msn/msn.c:527 src/protocols/msn/msn.c:1033
+#: src/protocols/irc/irc.c:1458
+#, c-format
+msgid "Received an invalid file send request from %s."
+msgstr "收到了 %s 发出的无效文件发送请求。"
+
+#: src/protocols/irc/irc.c:1539 src/protocols/msn/error.c:132
+#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:612
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/irc/irc.c:1495
+#: src/protocols/irc/irc.c:1602
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您已经被踢出了 %s: %s"
 
-#: src/protocols/irc/irc.c:1500
+#: src/protocols/irc/irc.c:1607
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1556 src/protocols/irc/irc.c:2810
+#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2927
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客户信息"
 
-#: src/protocols/irc/irc.c:1562 src/protocols/irc/irc.c:2816
+#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2933
 msgid "CTCP UserInfo"
 msgstr "CTCP 用户信息"
 
-#: src/protocols/irc/irc.c:1568 src/protocols/irc/irc.c:2822
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2939
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1595 src/protocols/irc/irc.c:2828
+#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2945
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1848 src/protocols/oscar/oscar.c:669
+#: src/protocols/irc/irc.c:1958 src/protocols/oscar/oscar.c:692
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:2104
+#: src/protocols/irc/irc.c:2214
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的话题是 %s"
 
-#: src/protocols/irc/irc.c:2200
+#: src/protocols/irc/irc.c:2310
 #, c-format
 msgid "You have left %s"
 msgstr "您已经离开了 %s"
 
-#: src/protocols/irc/irc.c:2201
+#: src/protocols/irc/irc.c:2311
 msgid "IRC Part"
 msgstr "IRC 部分"
 
-#: src/protocols/irc/irc.c:2256
+#: src/protocols/irc/irc.c:2366
 msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>正在请求 DCC 聊天</I>"
-
-#: src/protocols/irc/irc.c:2273
+msgstr "<I>正在请求二人世界</I>"
+
+#: src/protocols/irc/irc.c:2383
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2278
+#: src/protocols/irc/irc.c:2388
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
 msgstr ""
-"<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION "
-"<昵称><BR>PING <昵称></B><BR>"
-
-#: src/protocols/irc/irc.c:2286
+"<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
+"><BR>PING <昵称></B><BR>"
+
+#: src/protocols/irc/irc.c:2396
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr "<B>DCC 命令:<BR>CHAT <昵称></B>"
-
-#: src/protocols/irc/irc.c:2291
+msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
+
+#: src/protocols/irc/irc.c:2401
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
 "W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
 "CTCP commands<BR>Type /HELP DCC for DCC commands"
 msgstr ""
-"<B>目前支持的命令:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
-"TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
-"W WHOWAS<BR>输入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 "
-"CTCP 命令<BR>输入 /HELP DCC 可查看 DCC 命令"
-
-#: src/protocols/irc/irc.c:2314
+"<B>目前支持的命令:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
+"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>输"
+"入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
+"HELP DCC 可查看二人世界的命令"
+
+#: src/protocols/irc/irc.c:2424
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知命令</B>"
 
-#: src/protocols/irc/irc.c:2374
+#: src/protocols/irc/irc.c:2484
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:2378 src/main.c:340 src/multi.c:766
+#: src/protocols/irc/irc.c:2489 src/main.c:346 src/multi.c:773
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:2797
+#: src/protocols/irc/irc.c:2914
 msgid "DCC Chat"
-msgstr "DCC 聊天"
-
-#: src/protocols/irc/irc.c:2871 src/protocols/jabber/jabber.c:2888
-#: src/protocols/jabber/jabber.c:4300 src/protocols/napster/napster.c:617
+msgstr "二人世界"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/irc/irc.c:3020 src/protocols/irc/irc.c:3022
+msgid "IRC Protocol Plugin"
+msgstr "IRC 协议插件"
+
+#: src/protocols/irc/irc.c:3042 src/protocols/jabber/jabber.c:3006
+#: src/protocols/jabber/jabber.c:4473 src/protocols/napster/napster.c:609
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/protocols/irc/irc.c:2876 src/protocols/jabber/jabber.c:4311
-#: src/protocols/msn/msn.c:2055 src/protocols/napster/napster.c:623
-#: src/multi.c:1081
+#: src/protocols/irc/irc.c:3047 src/protocols/jabber/jabber.c:4484
+#: src/protocols/msn/msn.c:964 src/protocols/napster/napster.c:615
+#: src/multi.c:1099
 msgid "Port:"
 msgstr "端口:"
 
-#: src/protocols/irc/irc.c:2882
+#: src/protocols/irc/irc.c:3053
 msgid "Encoding:"
 msgstr "编码:"
 
-#: src/protocols/jabber/jabber.c:986
+#: src/protocols/jabber/jabber.c:989
 msgid "Unable to change password."
 msgstr "无法更改密码。"
 
-#: src/protocols/jabber/jabber.c:987
+#: src/protocols/jabber/jabber.c:990
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
-msgstr ""
-"您输入的旧密码不正确。您的密码未被更改。"
-
-#: src/protocols/jabber/jabber.c:992
+msgstr "您输入的旧密码不正确。您的密码未被更改。"
+
+#: src/protocols/jabber/jabber.c:995
 msgid "Unable to change password"
 msgstr "无法更改密码"
 
-#: src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:996
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
-msgstr ""
-"您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
-
-#: src/protocols/jabber/jabber.c:1154 src/gtkpounce.c:234 src/list.c:452
+msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
+
+#: src/protocols/jabber/jabber.c:1172 src/blist.c:708 src/gtkpounce.c:296
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/jabber.c:3355
-#: src/protocols/jabber/jabber.c:3406
+#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3486
+#: src/protocols/jabber/jabber.c:3537
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:1165 src/protocols/jabber/jabber.c:3357
-#: src/protocols/jabber/jabber.c:3414
+#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3488
+#: src/protocols/jabber/jabber.c:3545
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:1167 src/protocols/jabber/jabber.c:3358
-#: src/protocols/jabber/jabber.c:3418 src/protocols/oscar/oscar.c:2692
-#: src/protocols/oscar/oscar.c:4350 src/protocols/oscar/oscar.c:5534
+#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:3549 src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:4469 src/protocols/oscar/oscar.c:5690
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:1360
+#: src/protocols/jabber/jabber.c:1391
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 错误 %s"
 
-#: src/protocols/jabber/jabber.c:1466
+#: src/protocols/jabber/jabber.c:1556
 #, c-format
 msgid "Error %s: %s"
 msgstr "错误 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: src/protocols/jabber/jabber.c:1559
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/jabber.c:1646
+#: src/protocols/jabber/jabber.c:1760
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/jabber.c:1671
+#: src/protocols/jabber/jabber.c:1785
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr ""
-"Jabber 用户 %s 不存在,因此没有添加到您的人名单中。"
-
-#: src/protocols/jabber/jabber.c:1674
+msgstr "Jabber 用户 %s 不存在,因此没有添加到您的人名单中。"
+
+#: src/protocols/jabber/jabber.c:1788
 msgid "No such user."
 msgstr "没有这样的用户。"
 
-#: src/protocols/jabber/jabber.c:1765 src/protocols/msn/msn.c:545
-#: src/protocols/msn/msn.c:547 src/dialogs.c:940 src/list.c:255
+#: src/protocols/jabber/jabber.c:1879 src/protocols/msn/notification.c:505
+#: src/protocols/msn/notification.c:658 src/protocols/msn/notification.c:659
+#: src/blist.c:437 src/dialogs.c:960
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1842
+#: src/protocols/jabber/jabber.c:1952
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:1876
+#: src/protocols/jabber/jabber.c:1986
 msgid "Unknown login error"
 msgstr "未知的登录错误"
 
-#: src/protocols/jabber/jabber.c:2223
+#: src/protocols/jabber/jabber.c:2338
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2267 src/protocols/jabber/jabber.c:4154
+#: src/protocols/jabber/jabber.c:2383 src/protocols/jabber/jabber.c:4291
 msgid "Connection lost"
 msgstr "连接已丢失"
 
-#: src/protocols/jabber/jabber.c:2275
+#: src/protocols/jabber/jabber.c:2391
 msgid "Connected"
 msgstr "已连接"
 
-#: src/protocols/jabber/jabber.c:2278
+#: src/protocols/jabber/jabber.c:2394
 msgid "Requesting Authentication Method"
 msgstr "正在请求认证方法"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2298 src/protocols/msn/msn.c:1203
-#: src/protocols/yahoo/yahoo.c:965
+#: src/protocols/jabber/jabber.c:2414 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:181 src/protocols/yahoo/yahoo.c:987
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:2623
+#: src/protocols/jabber/jabber.c:2740
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "用户 %s 的 Jabber ID 无效,因此没有添加。"
 
-#: src/protocols/jabber/jabber.c:2625
+#: src/protocols/jabber/jabber.c:2742
 msgid "Jabber Error"
 msgstr "Jabber 错误"
 
-#: src/protocols/jabber/jabber.c:2884
+#: src/protocols/jabber/jabber.c:3001
 msgid "Room:"
 msgstr "房间:"
 
-#: src/protocols/jabber/jabber.c:2893
+#: src/protocols/jabber/jabber.c:3012
 msgid "Handle:"
 msgstr "门把手:"
 
-#: src/protocols/jabber/jabber.c:2917
+#: src/protocols/jabber/jabber.c:3042
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/jabber.c:3258
-#, c-format
-msgid "<b>Status:</b> %s%s%s"
-msgstr "<b>状态:</b> %s%s%s"
-
-#: src/protocols/jabber/jabber.c:3269 src/protocols/oscar/oscar.c:5192
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>状态:</b>未认证"
-
-#: src/protocols/jabber/jabber.c:3291 src/protocols/oscar/oscar.c:5220
+#: src/protocols/jabber/jabber.c:3278 src/protocols/jabber/jabber.c:3329
+#: src/protocols/jabber/jabber.c:3754
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: src/protocols/jabber/jabber.c:3279
+msgid "Error"
+msgstr "出错"
+
+#: src/protocols/jabber/jabber.c:3330 src/protocols/jabber/jabber.c:3389
+#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3780
+msgid "Status"
+msgstr "状态"
+
+#: src/protocols/jabber/jabber.c:3400 src/protocols/jabber/jabber.c:3422
+#: src/protocols/oscar/oscar.c:5372
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3304
+#: src/protocols/jabber/jabber.c:3435
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/protocols/jabber/jabber.c:3316 src/gtkconv.c:782
+#: src/protocols/jabber/jabber.c:3447 src/gtkconv.c:793
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/protocols/jabber/jabber.c:3323
+#: src/protocols/jabber/jabber.c:3454
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/jabber.c:3326
+#: src/protocols/jabber/jabber.c:3457
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/jabber.c:3333
+#: src/protocols/jabber/jabber.c:3464
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/jabber.c:3341
+#: src/protocols/jabber/jabber.c:3472
 msgid "Re-request authorization"
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3354 src/protocols/jabber/jabber.c:3404
-#: src/protocols/oscar/oscar.c:2704 src/protocols/oscar/oscar.c:4345
-#: src/protocols/oscar/oscar.c:5532 src/protocols/yahoo/yahoo.c:1066
+#: src/protocols/jabber/jabber.c:3485 src/protocols/jabber/jabber.c:3535
+#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:4464
+#: src/protocols/oscar/oscar.c:5688 src/protocols/yahoo/yahoo.c:1090
 #: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
 #: src/multi.c:274
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:3543
+#: src/protocols/jabber/jabber.c:3675
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3544
+#: src/protocols/jabber/jabber.c:3676
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3545
+#: src/protocols/jabber/jabber.c:3677
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3546
+#: src/protocols/jabber/jabber.c:3678
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3547 src/dialogs.c:2608
+#: src/protocols/jabber/jabber.c:3679 src/dialogs.c:2936
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3548
+#: src/protocols/jabber/jabber.c:3680
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3549
+#: src/protocols/jabber/jabber.c:3681
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3550
+#: src/protocols/jabber/jabber.c:3682
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3551
+#: src/protocols/jabber/jabber.c:3683
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3552
+#: src/protocols/jabber/jabber.c:3684
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3553 src/dialogs.c:1784 src/dialogs.c:2414
+#: src/protocols/jabber/jabber.c:3685 src/dialogs.c:2109 src/dialogs.c:2742
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/jabber.c:3554
+#: src/protocols/jabber/jabber.c:3686
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3555 src/dialogs.c:2472
+#: src/protocols/jabber/jabber.c:3687 src/dialogs.c:2800
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/jabber.c:3556
+#: src/protocols/jabber/jabber.c:3688
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3557
+#: src/protocols/jabber/jabber.c:3689
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3558
+#: src/protocols/jabber/jabber.c:3690
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3559
+#: src/protocols/jabber/jabber.c:3691
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3560
+#: src/protocols/jabber/jabber.c:3692
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3561 src/dialogs.c:2618 src/prefs.c:414
-#: src/prefs.c:1312
+#: src/protocols/jabber/jabber.c:3693 src/dialogs.c:2946 src/prefs.c:428
+#: src/prefs.c:1381
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3586
+#: src/protocols/jabber/jabber.c:3718
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
 
-#: src/protocols/jabber/jabber.c:3587
+#: src/protocols/jabber/jabber.c:3719
 msgid "User Identity"
 msgstr "用户标识"
 
-#: src/protocols/jabber/jabber.c:4011
+#: src/protocols/jabber/jabber.c:4145
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4084
+#: src/protocols/jabber/jabber.c:4220
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4111
+#: src/protocols/jabber/jabber.c:4247
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/protocols/jabber/jabber.c:4224 src/protocols/oscar/oscar.c:5718
-#: src/protocols/toc/toc.c:1434 src/dialogs.c:1954
+#: src/protocols/jabber/jabber.c:4362 src/protocols/oscar/oscar.c:5874
+#: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: src/protocols/jabber/jabber.c:4306
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/jabber/jabber.c:4451 src/protocols/jabber/jabber.c:4453
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 协议插件"
+
+#: src/protocols/jabber/jabber.c:4479
 msgid "Resource:"
 msgstr "资源:"
 
-#: src/protocols/jabber/jabber.c:4317
+#: src/protocols/jabber/jabber.c:4490
 msgid "Connect Server:"
 msgstr "连接服务器:"
 
-#: src/protocols/msn/msn.c:66
+#: src/protocols/msn/away.c:29 src/protocols/msn/msn.c:127
+#: src/protocols/msn/msn.c:320 src/protocols/yahoo/yahoo.c:1070
+#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
+msgid "Busy"
+msgstr "忙碌"
+
+#: src/protocols/msn/away.c:30 src/protocols/yahoo/yahoo.c:1088
+#: src/gtkpounce.c:568 src/prefs.c:1088
+msgid "Idle"
+msgstr "瞌睡"
+
+#: src/protocols/msn/away.c:31 src/protocols/msn/msn.c:126
+#: src/protocols/msn/msn.c:318 src/protocols/yahoo/yahoo.c:1068
+#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
+msgid "Be Right Back"
+msgstr "马上回来"
+
+#: src/protocols/msn/away.c:32 src/protocols/msn/msn.c:125
+#: src/protocols/msn/msn.c:316
+msgid "Away From Computer"
+msgstr "远离电脑"
+
+#: src/protocols/msn/away.c:33 src/protocols/msn/msn.c:128
+#: src/protocols/msn/msn.c:322 src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
+msgid "On The Phone"
+msgstr "接听电话"
+
+#: src/protocols/msn/away.c:34 src/protocols/msn/msn.c:129
+#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1082
+#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
+msgid "Out To Lunch"
+msgstr "外出就餐"
+
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
+msgid "Protocol not supported"
+msgstr "协议不支持"
+
+#: src/protocols/msn/dispatch.c:52
+msgid "Unable to request INF\n"
+msgstr "无法请求 INF\n"
+
+#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:183
+msgid "Unable to login using MD5"
+msgstr "无法使用 MD5 登入"
+
+#: src/protocols/msn/dispatch.c:78
+msgid "Unable to send USR\n"
+msgstr "无法发送 USR\n"
+
+#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:198
+msgid "Requesting to send password"
+msgstr "正在请求发送密码"
+
+#: src/protocols/msn/dispatch.c:100
+msgid "Got invalid XFR\n"
+msgstr "得到无效的 XFR\n"
+
+#: src/protocols/msn/dispatch.c:128
+msgid "Unable to transfer"
+msgstr "无法传送"
+
+#: src/protocols/msn/dispatch.c:150
+msgid "Unable to parse message."
+msgstr "无法处理消息。"
+
+#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:330
+#: src/protocols/msn/notification.c:1162
+msgid "Unable to write to server"
+msgstr "无法写入服务器。"
+
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1167
+msgid "Syncing with server"
+msgstr "正在与服务器同步"
+
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1180
+msgid "Error reading from server"
+msgstr "从服务器读取时出错"
+
+#: src/protocols/msn/error.c:32
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "语法错误(可能是 Gaim 错误)"
-
-#: src/protocols/msn/msn.c:69
+msgstr "语法错误(可能是 Gaim 的 bug)"
+
+#: src/protocols/msn/error.c:36
 msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "参数无效(可能是 Gaim 错误)"
-
-#: src/protocols/msn/msn.c:72
+msgstr "参数无效(可能是 Gaim 的 bug)"
+
+#: src/protocols/msn/error.c:39
 msgid "Invalid User"
 msgstr "用户无效"
 
-#: src/protocols/msn/msn.c:75
+#: src/protocols/msn/error.c:43
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/msn.c:78
+#: src/protocols/msn/error.c:46
 msgid "Already Login"
 msgstr "已登入"
 
-#: src/protocols/msn/msn.c:81
+#: src/protocols/msn/error.c:49
 msgid "Invalid Username"
 msgstr "用户名无效"
 
-#: src/protocols/msn/msn.c:84
+#: src/protocols/msn/error.c:52
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/msn.c:87
+#: src/protocols/msn/error.c:55
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/msn.c:90
+#: src/protocols/msn/error.c:58
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/msn.c:93
+#: src/protocols/msn/error.c:61
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/msn.c:96
+#: src/protocols/msn/error.c:64
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/msn.c:99
+#: src/protocols/msn/error.c:67
 msgid "Already in the mode"
-msgstr "已位于该模式"
-
-#: src/protocols/msn/msn.c:102
+msgstr "已在模式中"
+
+#: src/protocols/msn/error.c:70
 msgid "Already in opposite list"
-msgstr "已位于对立的列表"
-
-#: src/protocols/msn/msn.c:105
+msgstr "已在相对列表"
+
+#: src/protocols/msn/error.c:74
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr "试图向不存在的组中添加联系人"
+
+#: src/protocols/msn/error.c:78
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/msn.c:108
+#: src/protocols/msn/error.c:81
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/msn.c:112
+#: src/protocols/msn/error.c:85
 msgid "Required fields missing"
-msgstr "缺少请求域"
-
-#: src/protocols/msn/msn.c:115 src/protocols/oscar/oscar.c:194
+msgstr "缺少必须域"
+
+#: src/protocols/msn/error.c:88 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/msn.c:119
+#: src/protocols/msn/error.c:92
 msgid "Internal server error"
-msgstr "内部服务器出错"
-
-#: src/protocols/msn/msn.c:122
+msgstr "内部服务器错误"
+
+#: src/protocols/msn/error.c:95
 msgid "Database server error"
-msgstr "数据库服务器出错"
-
-#: src/protocols/msn/msn.c:125
+msgstr "数据库服务器错误"
+
+#: src/protocols/msn/error.c:98
 msgid "File operation error"
-msgstr "文件操作出错"
-
-#: src/protocols/msn/msn.c:128
+msgstr "文件操作错误"
+
+#: src/protocols/msn/error.c:101
 msgid "Memory allocation error"
-msgstr "内存分配出错"
-
-#: src/protocols/msn/msn.c:132
+msgstr "内存分配错误"
+
+#: src/protocols/msn/error.c:104
+msgid "Wrong CHL value sent to server"
+msgstr "给服务器发送的 CHL 值错误"
+
+#: src/protocols/msn/error.c:108
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/msn.c:135
+#: src/protocols/msn/error.c:111
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/msn.c:138
+#: src/protocols/msn/error.c:114
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/msn.c:141
+#: src/protocols/msn/error.c:117
 msgid "Database connect error"
-msgstr "数据库连接出错"
-
-#: src/protocols/msn/msn.c:144
+msgstr "数据库连接错误"
+
+#: src/protocols/msn/error.c:121
 msgid "Server is going down (abandon ship)"
-msgstr "服务器即将关闭"
-
-#: src/protocols/msn/msn.c:148
+msgstr "服务器即将维护"
+
+#: src/protocols/msn/error.c:125
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/msn.c:154
+#: src/protocols/msn/error.c:129
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR 参数未知或不允许"
+
+#: src/protocols/msn/error.c:135
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/msn.c:157
+#: src/protocols/msn/error.c:138
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/msn.c:160
+#: src/protocols/msn/error.c:141
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/msn.c:163
+#: src/protocols/msn/error.c:144
 msgid "Not expected"
 msgstr "未期待"
 
-#: src/protocols/msn/msn.c:166
+#: src/protocols/msn/error.c:147
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/error.c:151
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/msn.c:173
+#: src/protocols/msn/error.c:154
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/msn.c:176
+#: src/protocols/msn/error.c:157
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/msn.c:179
-msgid "User unverified"
-msgstr "用户未校验"
-
-#: src/protocols/msn/msn.c:182
-msgid "Unknown Error Code"
-msgstr "未知的错误代码"
-
-#: src/protocols/msn/msn.c:295 src/protocols/msn/msn.c:317
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1571
-#: src/protocols/msn/msn.c:1587 src/protocols/msn/msn.c:1705
-#: src/protocols/msn/msn.c:1718 src/protocols/msn/msn.c:1744
-#: src/protocols/msn/msn.c:1791 src/protocols/msn/msn.c:1809
-#: src/protocols/msn/msn.c:1843 src/protocols/msn/msn.c:1874
-#: src/protocols/msn/msn.c:1910 src/protocols/msn/msn.c:1917
-#: src/protocols/msn/msn.c:1930 src/protocols/msn/msn.c:1938
-#: src/protocols/msn/msn.c:1964 src/protocols/msn/msn.c:1973
-#: src/protocols/msn/msn.c:1986 src/protocols/msn/msn.c:1994
+#: src/protocols/msn/error.c:161
+msgid "Passport account not yet verified"
+msgstr "Passport 账户未验证"
+
+#: src/protocols/msn/error.c:165
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "未知的错误代码 %d"
+
+#: src/protocols/msn/msn.c:51
+msgid "Your new MSN friendly name is too long."
+msgstr "新的 MSN 友好名称太长。"
+
+#: src/protocols/msn/msn.c:64 src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:356
+#: src/protocols/msn/msn.c:391 src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:439 src/protocols/msn/msn.c:448
+#: src/protocols/msn/msn.c:481 src/protocols/msn/msn.c:490
+#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:515
+#: src/protocols/msn/msn.c:530 src/protocols/msn/msn.c:540
+#: src/protocols/msn/msn.c:562 src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:652 src/protocols/msn/msn.c:744
+#: src/protocols/msn/msn.c:767 src/protocols/msn/msn.c:782
+#: src/protocols/msn/msn.c:794 src/protocols/msn/msn.c:816
+#: src/protocols/msn/msn.c:826 src/protocols/msn/notification.c:55
+#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:787
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/msn/msn.c:366
-#, c-format
-msgid "The user %s (%s) wants to add %s to his or her buddy list."
-msgstr "用户 %s(%s) 想要将 %s 加为好友。"
-
-#: src/protocols/msn/msn.c:416 src/protocols/msn/msn.c:1189
-msgid "Unable to write to server"
-msgstr "无法写入服务器"
-
-#: src/protocols/msn/msn.c:517
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list"
-msgstr "用户 %s(%s) 想要将您加为好友"
-
-#: src/protocols/msn/msn.c:609
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "您已经被断开。原因是您从其它位置登入了。"
-
-#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:1074
-msgid "Got invalid XFR\n"
-msgstr "XFR 无效\n"
-
-#: src/protocols/msn/msn.c:798
-msgid "Error transferring"
-msgstr "传送出错"
-
-#: src/protocols/msn/msn.c:882 src/protocols/msn/msn.c:1120
-msgid "Error reading from server"
-msgstr "服务器读取出错"
-
-#: src/protocols/msn/msn.c:966
-msgid "Unable to connect to Notification Server"
-msgstr "无法连接到通知服务器"
-
-#: src/protocols/msn/msn.c:973
-msgid "Unable to talk to Notification Server"
-msgstr "无法与通知服务器通讯"
-
-#: src/protocols/msn/msn.c:989
-msgid "Protocol not supported"
-msgstr "协议不支持"
-
-#: src/protocols/msn/msn.c:996
-msgid "Unable to request INF\n"
-msgstr "无法请求 INF\n"
-
-#: src/protocols/msn/msn.c:1003
-msgid "Unable to login using MD5"
-msgstr "无法使用 MD5 登入"
-
-#: src/protocols/msn/msn.c:1010
-msgid "Unable to send USR\n"
-msgstr "无法发送 USR\n"
-
-#: src/protocols/msn/msn.c:1015
-msgid "Requesting to send password"
-msgstr "正在请求发送密码"
-
-#: src/protocols/msn/msn.c:1061
-msgid "Unable to send password"
-msgstr "无法发送密码"
-
-#: src/protocols/msn/msn.c:1066
-msgid "Password sent"
-msgstr "密码已送出"
-
-#: src/protocols/msn/msn.c:1094
-msgid "Unable to transfer"
-msgstr "无法传送"
-
-#: src/protocols/msn/msn.c:1102
-msgid "Unable to parse message"
-msgstr "无法处理消息"
-
-#: src/protocols/msn/msn.c:1195
-msgid "Synching with server"
-msgstr "正在与服务器同步"
-
-#: src/protocols/msn/msn.c:1520 src/protocols/msn/msn.c:1547
-#: src/protocols/msn/msn.c:1616
-msgid "Away From Computer"
-msgstr "远离电脑"
-
-#: src/protocols/msn/msn.c:1521 src/protocols/msn/msn.c:1549
-#: src/protocols/msn/msn.c:1614 src/protocols/yahoo/yahoo.c:1044
-#: src/protocols/yahoo/yahoo.c:1249 src/protocols/yahoo/yahoo.c:1325
-msgid "Be Right Back"
-msgstr "马上回来"
-
-#: src/protocols/msn/msn.c:1522 src/protocols/msn/msn.c:1551
-#: src/protocols/msn/msn.c:1612 src/protocols/yahoo/yahoo.c:1046
-#: src/protocols/yahoo/yahoo.c:1251 src/protocols/yahoo/yahoo.c:1326
-msgid "Busy"
-msgstr "忙碌"
-
-#: src/protocols/msn/msn.c:1523 src/protocols/msn/msn.c:1553
-#: src/protocols/msn/msn.c:1618 src/protocols/yahoo/yahoo.c:1054
-#: src/protocols/yahoo/yahoo.c:1259 src/protocols/yahoo/yahoo.c:1330
-msgid "On The Phone"
-msgstr "接听电话"
-
-#: src/protocols/msn/msn.c:1524 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1620 src/protocols/yahoo/yahoo.c:1058
-#: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1332
-msgid "Out To Lunch"
-msgstr "外出就餐"
-
-#: src/protocols/msn/msn.c:1525 src/protocols/msn/msn.c:1557
+#: src/protocols/msn/msn.c:72
+msgid "Set Friendly Name:"
+msgstr "设置友好的名称:"
+
+#: src/protocols/msn/msn.c:112 src/protocols/yahoo/yahoo.c:1141
+#, c-format
+msgid "<b>Status:</b> %s"
+msgstr "<b>状态:</b> %s"
+
+#: src/protocols/msn/msn.c:130 src/protocols/msn/msn.c:326
 #: src/protocols/zephyr/zephyr.c:859 src/protocols/zephyr/zephyr.c:874
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:1622 src/protocols/yahoo/yahoo.c:1064
-#: src/gtkpounce.c:504 src/prefs.c:1073
-msgid "Idle"
-msgstr "瞌睡"
-
-#: src/protocols/msn/msn.c:1651 src/protocols/yahoo/yahoo.c:1117
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>状态:</b> %s"
-
-#: src/protocols/msn/msn.c:1665 src/protocols/oscar/oscar.c:2948
-#: src/protocols/oscar/oscar.c:5567
-msgid "Send File"
-msgstr "发送文件"
-
-#: src/protocols/msn/msn.c:1737
-msgid "New MSN friendly name too long."
-msgstr "新的 MSN 友好名称太长。"
-
-#: src/protocols/msn/msn.c:1752
-msgid "Set Friendly Name:"
-msgstr "设置友好的名称:"
-
-#: src/protocols/msn/msn.c:1761
+#: src/protocols/msn/msn.c:142
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:1897
+#: src/protocols/msn/msn.c:420
+#, c-format
+msgid ""
+"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
+"%s@hotmail.com. No changes were made to your allow list."
+msgstr ""
+"MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
+"允许列表未作任何更改。"
+
+#: src/protocols/msn/msn.c:424 src/protocols/msn/msn.c:465
+msgid "Invalid MSN screenname"
+msgstr "无效的 MSN 用户名"
+
+#: src/protocols/msn/msn.c:461
 #, c-format
 msgid ""
-"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
-"meant %s@hotmail.com.  No changes were made to your allow list."
+"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
+"%s@hotmail.com. No changes were made to your block list."
 msgstr ""
-"MSN 屏幕名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。"
-"您的允许列表未作任何更改。"
-
-#: src/protocols/msn/msn.c:1900 src/protocols/msn/msn.c:1954
-msgid "Invalid MSN screenname"
-msgstr "无效的 MSN 屏幕名"
-
-#: src/protocols/msn/msn.c:1951
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\".  Perhaps you "
-"meant %s@hotmail.com.  No changes were made to your block list."
-msgstr ""
-"MSN 屏幕名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。"
-"您的屏蔽列表未作任何更改。"
-
-#: src/protocols/msn/msn.c:2049
+"MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
+"屏蔽列表未作任何更改。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/msn/msn.c:938 src/protocols/msn/msn.c:940
+msgid "MSN Protocol Plugin"
+msgstr "MSN 协议插件"
+
+#: src/protocols/msn/msn.c:958
 msgid "Login Server:"
 msgstr "登录服务器:"
 
-#: src/protocols/msn/switchboard.c:104
-#, c-format
-msgid "%s has closed the conversation window"
-msgstr "%s 已经关闭了对话窗口"
-
-#: src/protocols/msn/switchboard.c:181
+#: src/protocols/msn/notification.c:166
+msgid "Unable to request INF"
+msgstr "无法请求 INF"
+
+#: src/protocols/msn/notification.c:192
+msgid "Unable to send USR"
+msgstr "无法发送 USR"
+
+#: src/protocols/msn/notification.c:222
+msgid "Retrieving buddy list"
+msgstr "正在获取好友列表"
+
+#: src/protocols/msn/notification.c:246
+msgid "Unable to send password"
+msgstr "无法发送密码"
+
+#: src/protocols/msn/notification.c:252
+msgid "Password sent"
+msgstr "密码已送出"
+
+#: src/protocols/msn/notification.c:269
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
+
+#: src/protocols/msn/notification.c:275
+msgid "You have been disconnected. The MSN servers are going down temporarily."
+msgstr "您已经被断开。MSN 服务器目前维护中。"
+
+#: src/protocols/msn/notification.c:370
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
+
+#: src/protocols/msn/notification.c:596
+#, c-format
+msgid "The user %s (%s) wants to add you to their buddy list."
+msgstr "用户 %s(%s) 想要将您添加为好友。"
+
+#: src/protocols/msn/notification.c:969
+msgid "Got invalid XFR"
+msgstr "得到无效的 XFR"
+
+#: src/protocols/msn/notification.c:1123
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute(s). You will "
+"automatically be signed out at that time. Please finish any conversations in "
+"progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr ""
+"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
+"现在进行中的对话。\n"
+"\n"
+"维护完成后,您将能够成功登入。"
+
+#: src/protocols/msn/switchboard.c:121
+msgid "The conversation has become inactive and timed out."
+msgstr "对话已停止并超时。"
+
+#: src/protocols/msn/switchboard.c:125
+#, c-format
+msgid "%s has closed the conversation window."
+msgstr "%s 已经关闭了对话窗口。"
+
+#.
+#. * TODO: Investigate this, as it seems to occur frequently with
+#. *       the old prpl.
+#.
+#: src/protocols/msn/switchboard.c:224
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
-#: src/protocols/msn/switchboard.c:411
-msgid "Gaim was unable to send an MSN message"
-msgstr "Gaim 无法发送 MSN 消息"
-
-#: src/protocols/msn/switchboard.c:412
-msgid ""
-"Gaim encountered an error communicating with the MSN switchboard server.  "
-"Please try again later."
-msgstr ""
-"Gaim 与 MSN 切换板服务器通讯错误。请稍后再试一次。"
-
-#: src/protocols/napster/napster.c:459 src/protocols/oscar/oscar.c:4945
-#: src/protocols/toc/toc.c:1187
+#: src/protocols/napster/napster.c:460 src/protocols/oscar/oscar.c:5095
+#: src/protocols/toc/toc.c:1191
 msgid "Join what group:"
 msgstr "加入组:"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/napster/napster.c:700 src/protocols/napster/napster.c:702
+msgid "NAPSTER Protocol Plugin"
+msgstr "NAPSTER 协议插件"
+
 #: src/protocols/oscar/oscar.c:190
 msgid "Invalid error"
 msgstr "无效错误"
@@ -1786,80 +2116,80 @@
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Direct IM with %s closed"
-msgstr "与 %s 的直接即时消息已关闭"
-
-#: src/protocols/oscar/oscar.c:480
+msgstr "与 %s 的二人世界已关闭"
+
+#: src/protocols/oscar/oscar.c:487
 #, c-format
 msgid "Direct IM with %s failed"
-msgstr "与 %s 的直接即时消息失败"
-
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:602
+msgstr "与 %s 的二人世界失败"
+
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:850
+#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:854
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:555
+#: src/protocols/oscar/oscar.c:570
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:624 src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:643 src/protocols/oscar/oscar.c:705
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:664
+#: src/protocols/oscar/oscar.c:687
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:775 src/protocols/oscar/oscar.c:1147
+#: src/protocols/oscar/oscar.c:798 src/protocols/oscar/oscar.c:1181
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:782
+#: src/protocols/oscar/oscar.c:805
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:847 src/protocols/oscar/oscar.c:858
-#: src/protocols/oscar/oscar.c:862
+#: src/protocols/oscar/oscar.c:872 src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:887
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:847
+#: src/protocols/oscar/oscar.c:872
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:858
+#: src/protocols/oscar/oscar.c:883
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:862
+#: src/protocols/oscar/oscar.c:887
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1043 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1071 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1047
+#: src/protocols/oscar/oscar.c:1075
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1051
+#: src/protocols/oscar/oscar.c:1079
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1055
+#: src/protocols/oscar/oscar.c:1083
 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."
@@ -1868,21 +2198,21 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1059
+#: src/protocols/oscar/oscar.c:1087
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1063 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1091 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1085
+#: src/protocols/oscar/oscar.c:1119
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1186 src/protocols/oscar/oscar.c:1215
-#: src/protocols/oscar/oscar.c:1297
+#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
+#: src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -1890,73 +2220,73 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1188 src/protocols/oscar/oscar.c:1217
+#: src/protocols/oscar/oscar.c:1222 src/protocols/oscar/oscar.c:1252
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1299
+#: src/protocols/oscar/oscar.c:1338
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1833 src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5413
 #, c-format
 msgid "Direct IM with %s established"
-msgstr "与 %s 的直接即时消息已建立"
-
-#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2170
+msgstr "与 %s 的二人世界已建立"
+
+#: src/protocols/oscar/oscar.c:2219 src/protocols/oscar/oscar.c:2241
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2306
+#: src/protocols/oscar/oscar.c:2386
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s 刚刚请求直接连接到 %s"
-
-#: src/protocols/oscar/oscar.c:2307
+msgstr "%s 刚刚请求和 %s 二人世界"
+
+#: src/protocols/oscar/oscar.c:2387
 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 "
 "considered a privacy risk."
 msgstr ""
-"现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。"
-"但是这将暴露您的 IP 地址,所以可能造成潜在的隐私风险。"
-
-#: src/protocols/oscar/oscar.c:2330
+"现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
+"露您的 IP 地址,所以可能造成潜在的隐私风险。"
+
+#: src/protocols/oscar/oscar.c:2413
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2338
+#: src/protocols/oscar/oscar.c:2421
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2338
+#: src/protocols/oscar/oscar.c:2421
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2363
+#: src/protocols/oscar/oscar.c:2446
 #, 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:2367
+#: src/protocols/oscar/oscar.c:2450
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2401 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:2409 src/protocols/oscar/oscar.c:2474
-#: src/protocols/oscar/oscar.c:2486 src/protocols/oscar/oscar.c:2851
-#: src/protocols/oscar/oscar.c:2902 src/protocols/oscar/oscar.c:4872
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
+#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:3001 src/protocols/oscar/oscar.c:5020
+#: src/protocols/oscar/oscar.c:5062
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2409
+#: src/protocols/oscar/oscar.c:2492
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2560
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -1965,11 +2295,11 @@
 "用户 %lu 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2479 src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:5025
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2486
+#: src/protocols/oscar/oscar.c:2574
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -1979,17 +2309,17 @@
 "用户 %lu 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2575
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2493
+#: src/protocols/oscar/oscar.c:2581
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "用户 %lu 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2500
+#: src/protocols/oscar/oscar.c:2588
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2002,7 +2332,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2508
+#: src/protocols/oscar/oscar.c:2596
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2015,7 +2345,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2516
+#: src/protocols/oscar/oscar.c:2604
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2028,32 +2358,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:2625
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ 用户 %lu 给您发送了一个联系人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2541
+#: src/protocols/oscar/oscar.c:2629
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您是否想要将此联系人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2541
+#: src/protocols/oscar/oscar.c:2629
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:2713
 #, 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:2632
+#: src/protocols/oscar/oscar.c:2724
 #, 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:2643
+#: src/protocols/oscar/oscar.c:2735
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2061,163 +2391,167 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2746
 #, 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:2665
+#: src/protocols/oscar/oscar.c:2757
 #, 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:2675
+#: src/protocols/oscar/oscar.c:2767
 #, 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:2690 src/protocols/oscar/oscar.c:4359
-#: src/protocols/oscar/oscar.c:5537
+#: src/protocols/oscar/oscar.c:2782 src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:5693
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2694 src/protocols/oscar/oscar.c:4353
-#: src/protocols/oscar/oscar.c:5535
+#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:5691
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2696 src/protocols/oscar/oscar.c:4356
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:2788 src/protocols/oscar/oscar.c:4475
+#: src/protocols/oscar/oscar.c:5692
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2700
+#: src/protocols/oscar/oscar.c:2792
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2759
+#: src/protocols/oscar/oscar.c:2854
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2815
+#: src/protocols/oscar/oscar.c:2913
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2816
+#: src/protocols/oscar/oscar.c:2914
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2850
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:2901
+#: src/protocols/oscar/oscar.c:3000
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/protocols/oscar/oscar.c:2933
+#: src/protocols/oscar/oscar.c:3032
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:2936
+#: src/protocols/oscar/oscar.c:3035
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:2939 src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5717
 msgid "Direct IM"
-msgstr "直接即时消息"
-
-#: src/protocols/oscar/oscar.c:2942 src/buddy.c:1281
+msgstr "二人世界"
+
+#: src/protocols/oscar/oscar.c:3041 src/gtkblist.c:1480
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:3044 src/protocols/oscar/oscar.c:5729
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:2952
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5723
+msgid "Send File"
+msgstr "发送文件"
+
+#: src/protocols/oscar/oscar.c:3051
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:2955
+#: src/protocols/oscar/oscar.c:3054
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:3057
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:2961
+#: src/protocols/oscar/oscar.c:3060
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:3063
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:2967
+#: src/protocols/oscar/oscar.c:3066
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:2970
+#: src/protocols/oscar/oscar.c:3069
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3072
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:2976
+#: src/protocols/oscar/oscar.c:3075
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:2979
+#: src/protocols/oscar/oscar.c:3078
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3081
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3021
+#: src/protocols/oscar/oscar.c:3120
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3027
+#: src/protocols/oscar/oscar.c:3127
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3032
+#: src/protocols/oscar/oscar.c:3132
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3038
+#: src/protocols/oscar/oscar.c:3138
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3141
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3144
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2230,291 +2564,305 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3076
+#: src/protocols/oscar/oscar.c:3176
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3087
+#: src/protocols/oscar/oscar.c:3187
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3093
+#: src/protocols/oscar/oscar.c:3193
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3215
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3463
+#: src/protocols/oscar/oscar.c:3576
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3464
+#: src/protocols/oscar/oscar.c:3577
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
-"最后一条消息未送出,原因是您已经得到了速度极限。"
-"请等 10 秒,然后再试一次。"
-
-#: src/protocols/oscar/oscar.c:3522
+"最后一条消息未送出,原因是您已经得到了速度极限。请等 10 秒,然后再试一次。"
+
+#: src/protocols/oscar/oscar.c:3636
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
-msgstr ""
-"您已经断开了连接,原因是您在其它位置用此屏幕名登入了。"
-
-#: src/protocols/oscar/oscar.c:3524
+msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
+
+#: src/protocols/oscar/oscar.c:3638
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3762
+#: src/protocols/oscar/oscar.c:3865
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3767
+#: src/protocols/oscar/oscar.c:3870
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3770
+#: src/protocols/oscar/oscar.c:3873
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3773 src/protocols/oscar/oscar.c:3779
+#: src/protocols/oscar/oscar.c:3876 src/protocols/oscar/oscar.c:3882
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3784
+#: src/protocols/oscar/oscar.c:3887
 msgid "Mobile Phone:"
 msgstr "移动电话:"
 
-#: src/protocols/oscar/oscar.c:3787
+#: src/protocols/oscar/oscar.c:3890
 msgid "Gender:"
 msgstr "性别:"
 
-#: src/protocols/oscar/oscar.c:3787
+#: src/protocols/oscar/oscar.c:3890
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3787
+#: src/protocols/oscar/oscar.c:3890
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3796
+#: src/protocols/oscar/oscar.c:3899
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3801
+#: src/protocols/oscar/oscar.c:3904
 msgid "Age:"
 msgstr "年龄:"
 
-#: src/protocols/oscar/oscar.c:3804
+#: src/protocols/oscar/oscar.c:3907
 msgid "Personal Web Page:"
 msgstr "个人主页:"
 
-#: src/protocols/oscar/oscar.c:3807
+#: src/protocols/oscar/oscar.c:3910
 msgid "Additional Information:"
 msgstr "额外信息:"
 
-#: src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:3914
 msgid "Home Address:"
 msgstr "家庭住址:"
 
-#: src/protocols/oscar/oscar.c:3813 src/protocols/oscar/oscar.c:3829
+#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3816 src/protocols/oscar/oscar.c:3832
+#: src/protocols/oscar/oscar.c:3919 src/protocols/oscar/oscar.c:3935
 msgid "City:"
 msgstr "城市:"
 
-#: src/protocols/oscar/oscar.c:3819 src/protocols/oscar/oscar.c:3835
+#: src/protocols/oscar/oscar.c:3922 src/protocols/oscar/oscar.c:3938
 msgid "State:"
 msgstr "州/省:"
 
-#: src/protocols/oscar/oscar.c:3822 src/protocols/oscar/oscar.c:3838
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:3941
 msgid "Zip Code:"
 msgstr "邮政编码:"
 
-#: src/protocols/oscar/oscar.c:3827
+#: src/protocols/oscar/oscar.c:3930
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:3843
+#: src/protocols/oscar/oscar.c:3946
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:3845
+#: src/protocols/oscar/oscar.c:3948
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:3848
+#: src/protocols/oscar/oscar.c:3951
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:3851
+#: src/protocols/oscar/oscar.c:3954
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:3854
+#: src/protocols/oscar/oscar.c:3957
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:3963
+#: src/protocols/oscar/oscar.c:4027
+#, c-format
+msgid "<B>%s has the following screen names:</B><BR>"
+msgstr "<B>%s 拥有下列用户名:</B><BR>"
+
+#: src/protocols/oscar/oscar.c:4045
+#, c-format
+msgid "No results found for email address %s"
+msgstr "未找到与电子邮件地址 %s 匹配的结果"
+
+#: src/protocols/oscar/oscar.c:4065
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "您应当收到询问确认 %s 的邮件。"
+
+#: src/protocols/oscar/oscar.c:4067
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:3990
+#: src/protocols/oscar/oscar.c:4095
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:3993
+#: src/protocols/oscar/oscar.c:4098
 #, 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:3996
+msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
+
+#: src/protocols/oscar/oscar.c:4101
 #, 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:3999
+msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名以空格结尾。"
+
+#: src/protocols/oscar/oscar.c:4104
 #, 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:4002
+msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
+
+#: src/protocols/oscar/oscar.c:4107
 #, 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:4005
+msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
+
+#: src/protocols/oscar/oscar.c:4110
 #, 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:4008
+msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
+
+#: src/protocols/oscar/oscar.c:4113
 #, 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:4011
+#: src/protocols/oscar/oscar.c:4116
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4021
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
 "%s"
 msgstr ""
-"您的屏幕名格式化后如下:\n"
+"您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:4127 src/protocols/oscar/oscar.c:4133
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4132
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4235
+#: src/protocols/oscar/oscar.c:4354
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4355
 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 "
 "fully connected."
 msgstr ""
-"您在登录过程完成之前请求设定配置文件。"
-"您的配置文件尚未设定;请在您完全连接后再试一次。"
-
-#: src/protocols/oscar/oscar.c:4263
+"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
+"再试一次。"
+
+#: src/protocols/oscar/oscar.c:4382
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
 
-#: src/protocols/oscar/oscar.c:4265
+#: src/protocols/oscar/oscar.c:4384
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4400
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4401
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 msgstr ""
-"您在登录过程完成之前请求设定离开消息。"
-"您仍将处于目前的状态;请在您完全连接后再试一次。"
-
-#: src/protocols/oscar/oscar.c:4318
+"您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
+"再试一次。"
+
+#: src/protocols/oscar/oscar.c:4437
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it and set you away."
 msgstr ""
-"已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离开。"
-
-#: src/protocols/oscar/oscar.c:4320
+"已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
+"开。"
+
+#: src/protocols/oscar/oscar.c:4439
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4525
+#: src/protocols/oscar/oscar.c:4652
 msgid "Unable To Retrive Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4525
+#: src/protocols/oscar/oscar.c:4652
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
-"Gaim 暂时无法从 AIM 服务器获取您的好友列表。"
-"您的好友列表没有丢失,可能稍等几小时就能用了。"
-
-#: src/protocols/oscar/oscar.c:4610 src/protocols/oscar/oscar.c:4611
-#: src/protocols/oscar/oscar.c:4615
+"Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
+"小时就能用了。"
+
+#: src/protocols/oscar/oscar.c:4742 src/protocols/oscar/oscar.c:4743
+#: src/protocols/oscar/oscar.c:4748
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:4750
+#: src/protocols/oscar/oscar.c:4893
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
-"您的好友列表中最多可容纳 %d 人,而您现在已经有 %d 人了。"
-"除非您的人数在允许范围之内,否则某些好友的在线状态不会显示出来。"
-
-#: src/protocols/oscar/oscar.c:4753
+"您的好友列表中最多可容纳 %d 人,而您现在已经有 %d 人了。除非您的人数在允许范"
+"围之内,否则某些好友的在线状态不会显示出来。"
+
+#: src/protocols/oscar/oscar.c:4896
 msgid "Maximum buddy list length exceeded."
 msgstr "达到了好友列表的最多人数。"
 
-#: src/protocols/oscar/oscar.c:4791
+#: src/protocols/oscar/oscar.c:4936
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2522,32 +2870,31 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:4791 src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4936 src/protocols/oscar/oscar.c:4950
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:4792 src/protocols/oscar/oscar.c:4805
+#: src/protocols/oscar/oscar.c:4937 src/protocols/oscar/oscar.c:4951
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:4804
+#: src/protocols/oscar/oscar.c:4950
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "无法添加好友 %s,原因未知。"
 
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4985
 #, 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:4843
+msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
+
+#: src/protocols/oscar/oscar.c:4990
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:5020
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -2557,17 +2904,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:5058
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:5059
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:5062
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -2577,119 +2924,137 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4914
+#: src/protocols/oscar/oscar.c:5063
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:4949 src/protocols/toc/toc.c:1191
+#: src/protocols/oscar/oscar.c:5100 src/protocols/toc/toc.c:1196
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5320
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5177
+#: src/protocols/oscar/oscar.c:5329
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5184
+#: src/protocols/oscar/oscar.c:5336
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5196 src/buddy.c:698
+#: src/protocols/oscar/oscar.c:5344
+msgid "<b>Status:</b> Not Authorized"
+msgstr "<b>状态:</b>未认证"
+
+#: src/protocols/oscar/oscar.c:5348 src/gtkblist.c:845
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5222
+#: src/protocols/oscar/oscar.c:5374
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5399
+#: src/protocols/oscar/oscar.c:5555
 msgid "Unable to open Direct IM"
-msgstr "无法打开直接即时通讯"
-
-#: src/protocols/oscar/oscar.c:5412
+msgstr "无法开始二人世界"
+
+#: src/protocols/oscar/oscar.c:5568
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您选择了与 %s 进行直接连接的即时通讯。"
-
-#: src/protocols/oscar/oscar.c:5413
+msgstr "您选择了与 %s 进行二人世界连接。"
+
+#: src/protocols/oscar/oscar.c:5569
 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:5551
+#: src/protocols/oscar/oscar.c:5707
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5585
+#: src/protocols/oscar/oscar.c:5741
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5606
+#: src/protocols/oscar/oscar.c:5762
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5607
+#: src/protocols/oscar/oscar.c:5763
 msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr "屏幕名格式化只更改大写和空格。"
-
-#: src/protocols/oscar/oscar.c:5613
+msgstr "用户名格式化只更改大写和空格。"
+
+#: src/protocols/oscar/oscar.c:5769
 msgid "New screenname formatting:"
-msgstr "新的屏幕名格式化:"
-
-#: src/protocols/oscar/oscar.c:5658
+msgstr "新的用户名格式化:"
+
+#: src/protocols/oscar/oscar.c:5814
 msgid "Change Address To: "
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5668
+#: src/protocols/oscar/oscar.c:5824
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:5693
+#: src/protocols/oscar/oscar.c:5849
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5854
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
 "clicking on them and clicking \"Re-request authorization.\""
 msgstr ""
-"%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,"
-"然后单击“重新请求认证”。"
-
-#: src/protocols/oscar/oscar.c:5733
+"%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
+"单击“重新请求认证”。"
+
+#: src/protocols/oscar/oscar.c:5887
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:5744
+#: src/protocols/oscar/oscar.c:5898
 msgid "Format Screenname"
-msgstr "格式化屏幕名"
-
-#: src/protocols/oscar/oscar.c:5750
+msgstr "格式化用户名"
+
+#: src/protocols/oscar/oscar.c:5904
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:5756
+#: src/protocols/oscar/oscar.c:5910
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5762
+#: src/protocols/oscar/oscar.c:5916
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5771
+#: src/protocols/oscar/oscar.c:5925
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:5779
+#: src/protocols/oscar/oscar.c:5933
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/oscar/oscar.c:6053 src/protocols/oscar/oscar.c:6055
+msgid "AIM/ICQ Protocol Plugin"
+msgstr "AIM/ICQ 协议插件"
+
 #: src/protocols/toc/toc.c:190
 #, c-format
 msgid "Looking up %s"
@@ -2823,117 +3188,146 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:869
+#: src/protocols/toc/toc.c:873
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:872
+#: src/protocols/toc/toc.c:876
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:872
+#: src/protocols/toc/toc.c:876
 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 "
 "is only temporary, please be patient."
 msgstr ""
 "在这种情况下,TOC 将会忽略送出的任何消息,而且如果您强行送出消息的话,还可能"
-"将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片刻。"
-
-#: src/protocols/toc/toc.c:1316
+"将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
+"刻。"
+
+#: src/protocols/toc/toc.c:1319
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1440
+#: src/protocols/toc/toc.c:1443
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1495
-msgid "TOC Host:"
-msgstr "TOC 主机:"
-
-#: src/protocols/toc/toc.c:1501
-msgid "TOC Port:"
-msgstr "TOC 端口:"
-
-#: src/protocols/toc/toc.c:1628
+#: src/protocols/toc/toc.c:1566
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1706 src/protocols/toc/toc.c:1745
-#: src/protocols/toc/toc.c:1953
+#: src/protocols/toc/toc.c:1644 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1891
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1868
+#: src/protocols/toc/toc.c:1806
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1900
+#: src/protocols/toc/toc.c:1838
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:1998 src/gtkft.c:1056
+#: src/protocols/toc/toc.c:1936 src/gtkft.c:1056
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:2032
+#: src/protocols/toc/toc.c:1970
 #, 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:2039
+#: src/protocols/toc/toc.c:1977
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
 
-#: src/protocols/toc/toc.c:2041 src/gtkft.c:1109 src/server.c:1065
+#: src/protocols/toc/toc.c:1979 src/gtkft.c:1109 src/server.c:1237
 msgid "Accept"
 msgstr "接受"
 
-#: src/protocols/yahoo/yahoo.c:586
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/toc/toc.c:2049 src/protocols/toc/toc.c:2051
+msgid "TOC Protocol Plugin"
+msgstr "TOC 协议插件"
+
+#: src/protocols/toc/toc.c:2069
+msgid "TOC Host:"
+msgstr "TOC 主机:"
+
+#: src/protocols/toc/toc.c:2075
+msgid "TOC Port:"
+msgstr "TOC 端口:"
+
+#: src/protocols/yahoo/yahoo.c:604
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:1048 src/protocols/yahoo/yahoo.c:1253
-#: src/protocols/yahoo/yahoo.c:1327
+#: src/protocols/yahoo/yahoo.c:1072 src/protocols/yahoo/yahoo.c:1277
+#: src/protocols/yahoo/yahoo.c:1351
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1050 src/protocols/yahoo/yahoo.c:1255
-#: src/protocols/yahoo/yahoo.c:1328
+#: src/protocols/yahoo/yahoo.c:1074 src/protocols/yahoo/yahoo.c:1279
+#: src/protocols/yahoo/yahoo.c:1352
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1257
-#: src/protocols/yahoo/yahoo.c:1329
+#: src/protocols/yahoo/yahoo.c:1076 src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1353
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1261
-#: src/protocols/yahoo/yahoo.c:1331
+#: src/protocols/yahoo/yahoo.c:1080 src/protocols/yahoo/yahoo.c:1285
+#: src/protocols/yahoo/yahoo.c:1355
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1265
-#: src/protocols/yahoo/yahoo.c:1333
+#: src/protocols/yahoo/yahoo.c:1084 src/protocols/yahoo/yahoo.c:1289
+#: src/protocols/yahoo/yahoo.c:1357
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:1185
+#: src/protocols/yahoo/yahoo.c:1209
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:1409
+#: src/protocols/yahoo/yahoo.c:1434
 msgid "Pager Host:"
 msgstr "寻呼主机:"
 
-#: src/protocols/yahoo/yahoo.c:1415
+#: src/protocols/yahoo/yahoo.c:1440
 msgid "Pager Port:"
 msgstr "寻呼端口:"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/yahoo/yahoo.c:1526 src/protocols/yahoo/yahoo.c:1528
+msgid "Yahoo Protocol Plugin"
+msgstr "Yahoo 协议插件"
+
 #: src/protocols/zephyr/zephyr.c:336
 #, c-format
 msgid "<b>User:</b> %s<br>"
@@ -2966,7 +3360,8 @@
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr ""
-"由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个账户。"
+"由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
+"账户。"
 
 #: src/protocols/zephyr/zephyr.c:844
 msgid "ZLocate"
@@ -2976,98 +3371,68 @@
 msgid "Class:"
 msgstr "类:"
 
-#: src/protocols/zephyr/zephyr.c:888
+#: src/protocols/zephyr/zephyr.c:889
 msgid "Instance:"
 msgstr "实例:"
 
-#: src/protocols/zephyr/zephyr.c:892
+#: src/protocols/zephyr/zephyr.c:894
 msgid "Recipient:"
 msgstr "接受者:"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/zephyr/zephyr.c:1026 src/protocols/zephyr/zephyr.c:1028
+msgid "Zephyr Protocol Plugin"
+msgstr "Zephyr 协议插件"
+
 #: src/about.c:74
 #, c-format
 msgid "About Gaim v%s"
 msgstr "关于 Gaim v%s"
 
 #: src/about.c:106
-msgid "Gaim is a modular Instant Messaging client capable of "
-msgstr "Gaim 是模块化的即时消息客户程序,同时支持"
-
-#: src/about.c:107
-msgid "using AIM, ICQ, Yahoo!, MSN, IRC, Jabber, Napster, "
-msgstr "AIM,ICQ,Yahoo!,MSN,IRC,Jabber,Napster,"
-
-#: src/about.c:108
-msgid "Zephyr, and Gadu-Gadu all at once.  It is written using "
-msgstr "Zephyr 和 Gadu-Gadu。本程序使用 Gtk+ 写成,并以 "
-
-#: src/about.c:109
-msgid "Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr "GPL 协议发行。<BR><BR>"
+msgid ""
+"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
+"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
+"written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"Gaim 是模块化的即时通讯客户程序,同时支持 AIM,ICQ,Yahoo!,MSN,IRC,"
+"Jabber,Napster,Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写成,并以 GPL 许可协议发"
+"行。<BR><BR>"
 
 #: src/about.c:116
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim"
-
-#: src/about.c:117
-msgid "<BR><BR>"
-msgstr "<BR><BR>"
+msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
 
 #: src/about.c:120
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">当前开发者:</FONT><BR>"
 
 #: src/about.c:122
-msgid "  Rob Flynn (maintainer) "
-msgstr "  Rob Flynn (维护者) "
-
-#: src/about.c:123
-msgid "&lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</A>&gt;<BR>"
-msgstr "&lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</A>&gt;<BR>"
-
-#: src/about.c:124
-msgid "  Sean Egan (lead developer) "
-msgstr "  Sean Egan (领导开发者) "
-
-#: src/about.c:125
-msgid "&lt;<A HREF=\"mailto:bj91704@binghamton.edu\">"
-msgstr "&lt;<A HREF=\"mailto:bj91704@binghamton.edu\">"
-
-#: src/about.c:126
-msgid "bj91704@binghamton.edu</A>&gt;<BR>"
-msgstr "bj91704@binghamton.edu</A>&gt;<BR>"
-
-#: src/about.c:127
-msgid "  Christian 'ChipX86' Hammond (developer & webmaster)<BR>"
-msgstr "  Christian 'ChipX86' Hammond (开发和网管)<BR>"
-
-#: src/about.c:128
-msgid "  Herman Bloggs (win32 port) "
-msgstr "  Herman Bloggs (win32 移植) "
-
-#: src/about.c:129
-msgid "&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">"
-msgstr "&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">"
-
-#: src/about.c:130
-msgid "hermanator12002@yahoo.com</A>&gt;<BR>"
-msgstr "hermanator12002@yahoo.com</A>&gt;<BR>"
-
-#: src/about.c:131
-msgid "  Nathan 'faceprint' Walp (developer)<BR>"
-msgstr "  Nathan 'faceprint' Walp (开发者)<BR>"
-
-#: src/about.c:132
-msgid "  Mark 'KingAnt' Doliner (developer)<BR>"
-msgstr "  Mark 'KingAnt' Doliner (开发者)<BR>"
-
-#: src/about.c:133
-msgid "  Luke 'LSchiere' Schierer (support)<BR>"
-msgstr "  Luke 'LSchiere' Schierer (支持)<BR>"
-
-#: src/about.c:134 src/about.c:159
-msgid "<BR>"
-msgstr "<BR>"
+msgid ""
+"  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
+"bj91704@binghamton.edu\">bj91704@binghamton.edu</A>&gt;<BR>  Christian "
+"'ChipX86' Hammond (developer & webmaster)<BR>  Herman Bloggs (win32 port) "
+"&lt;<A HREF=\"mailto:hermanator12002@yahoo.com\">hermanator12002@yahoo.com</"
+"A>&gt;<BR>  Nathan 'faceprint' Walp (developer)<BR>  Mark 'KingAnt' Doliner "
+"(developer)<BR>  Luke 'LSchiere' Schierer (support)<BR><BR>"
+msgstr ""
+"  Rob Flynn (维护者) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
+"A>&gt;<BR>  Sean Egan (领导者) &lt;<A HREF=\"mailto:bj91704@binghamton.edu"
+"\">bj91704@binghamton.edu</A>&gt;<BR>  Christian 'ChipX86' Hammond (开发者和"
+"网管)<BR>  Herman Bloggs (win32 移植) &lt;<A HREF=\"mailto:"
+"hermanator12002@yahoo.com\">hermanator12002@yahoo.com</A>&gt;<BR>  Nathan "
+"'faceprint' Walp (开发者)<BR>  Mark 'KingAnt' Doliner (开发者)<BR>  Luke "
+"'LSchiere' Schierer (支持)<BR><BR>"
 
 #: src/about.c:137
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
@@ -3078,340 +3443,106 @@
 msgstr "<FONT SIZE=\"3\">退休开发者:</FONT><BR>"
 
 #: src/about.c:149
-msgid "  Adam Fritzler (former libfaim maintainer)<BR>"
-msgstr "  Adam Fritzler (先前 libfaim 的维护者)<BR>"
-
-#: src/about.c:150
-msgid "  Eric Warmenhoven (former lead developer)"
-msgstr "  Eric Warmenhoven (先前的领导开发者)"
-
-#: src/about.c:151
-msgid "&lt;<A HREF=\"mailto:warmenhoven@yahoo.com\">"
-msgstr "&lt;<A HREF=\"mailto:warmenhoven@yahoo.com\">"
-
-#: src/about.c:152
-msgid "warmenhoven@yahoo.com</A>&gt;<BR>"
-msgstr "warmenhoven@yahoo.com</A>&gt;<BR>"
-
-#: src/about.c:153
-msgid "  Jim Duchek (former maintainer)<BR>"
-msgstr "  Jim Duchek (先前维护者)<BR>"
-
-#: src/about.c:154
-msgid "  Jim Seymour (former Jabber developer)<BR>"
-msgstr "  Jim Seymour (先前 Jabber 开发者)<BR>"
-
-#: src/about.c:155
-msgid "  Mark Spencer (original author) "
-msgstr "  Mark Spencer (原始作者) "
-
-#: src/about.c:156
-msgid "&lt;<A HREF=\"mailto:markster@marko.net\">"
-msgstr "&lt;<A HREF=\"mailto:markster@marko.net\">"
-
-#: src/about.c:157
-msgid "markster@marko.net</A>&gt;<BR>"
-msgstr "markster@marko.net</A>&gt;<BR>"
-
-#: src/about.c:158
-msgid "  Syd Logan (hacker and designated driver [lazy bum])<BR>"
-msgstr "  Syd Logan (黑客和指定驱动程序[lazy bum])<BR>"
-
-#: src/about.c:169 src/dialogs.c:3816 src/prpl.c:552 src/prpl.c:850
-#: src/server.c:1257
+msgid ""
+"  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
+"lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
+"\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
+"Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+"&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
+"Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
+msgstr ""
+"  Adam Fritzler (先前 libfaim 维护者)<BR>  Eric Warmenhoven (先前领导者)&lt;"
+"<A HREF=\"mailto:warmenhoven@yahoo.com\">warmenhoven@yahoo.com</A>&gt;<BR>  "
+"Jim Duchek (先前维护者)<BR>  Jim Seymour (先前 Jabber 开发者)<BR>  Mark "
+"Spencer (原始作者) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
+"net</A>&gt;<BR>  Syd Logan (骇客和专属驱动程序[lazy bum])<BR><BR>"
+
+#: src/about.c:169 src/dialogs.c:4239 src/prpl.c:500 src/prpl.c:806
+#: src/server.c:1428
 msgid "Close"
 msgstr "关闭"
 
-#: src/away.c:219
+#: src/away.c:221
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
 
-#: src/away.c:279
+#: src/away.c:281
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:379
+#: src/away.c:383
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:399
+#: src/away.c:403
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
-#: src/away.c:588
+#: src/away.c:600
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/browser.c:413 src/browser.c:439
+#: src/blist.c:365 src/prefs.c:1790
+msgid "Chats"
+msgstr "聊天"
+
+#: src/blist.c:673
+#, c-format
+msgid ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies, and the group were not removed.\n"
+msgstr ""
+"%2$s 组中的 %1:d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
+"除。\n"
+
+#: src/blist.c:677
+msgid "Group Not Removed"
+msgstr "组未删除"
+
+#: src/blist.c:844
+msgid "Invalid Groupname"
+msgstr "组名无效"
+
+#: src/blist.c:1566
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded."
+msgstr "处理您的好友列表时出错。好友列表未装入。"
+
+#: src/blist.c:1568
+msgid "Buddy List Error"
+msgstr "好友列表出错"
+
+#. rob wants to inform the user that their buddy lists are
+#. * being converted
+#: src/blist.c:1574
+#, c-format
+msgid ""
+"Gaim is converting your old buddy lists to a new format, which will now be "
+"located at %s"
+msgstr "Gaim 正在将您旧的好友列表转换为新格式,并存放在 %s"
+
+#: src/blist.c:1577
+msgid "Converting Buddy List"
+msgstr "正在转换好友列表"
+
+#: src/browser.c:426 src/browser.c:453
 msgid ""
 "Communication with the browser failed.  Please close all windows and try "
 "again."
 msgstr "与浏览器通讯出现问题。请关闭所有窗口,稍后再试一次。"
 
-#: src/browser.c:567
+#: src/browser.c:586
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
 msgstr "无法调用您的浏览器,原因是选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/browser.c:582
+#: src/browser.c:601
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "调用您选择的浏览器 %s 出错"
 
-#: src/buddy.c:332
-msgid "_Add a Buddy"
-msgstr "添加好友(_A)"
-
-#: src/buddy.c:333
-msgid "_Delete Group"
-msgstr "删除组(_D)"
-
-#: src/buddy.c:334
-msgid "_Rename"
-msgstr "重命名(_R)"
-
-#: src/buddy.c:340
-msgid "_Get Info"
-msgstr "获取信息(_G)"
-
-#: src/buddy.c:342
-msgid "_IM"
-msgstr "开聊(_I)"
-
-#: src/buddy.c:343
-msgid "Add Buddy _Pounce"
-msgstr "添加好友千里眼(_P)"
-
-#: src/buddy.c:344
-msgid "View _Log"
-msgstr "查看日志(_L)"
-
-#: src/buddy.c:361
-msgid "_Alias"
-msgstr "别名(_A)"
-
-#: src/buddy.c:362
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#. Buddies menu
-#: src/buddy.c:640
-msgid "/_Buddies"
-msgstr "/好友(_B)"
-
-#: src/buddy.c:641
-msgid "/Buddies/New _Instant Message..."
-msgstr "/好友(B)/新即时消息(_I)..."
-
-#: src/buddy.c:642
-msgid "/Buddies/Join a _Chat..."
-msgstr "/好友(B)/加入聊天(_C)..."
-
-#: src/buddy.c:643
-msgid "/Buddies/Get _User Info..."
-msgstr "/好友(B)/获取用户信息(_U)..."
-
-#: src/buddy.c:645
-msgid "/Buddies/_Show Offline Buddies"
-msgstr "/好友(B)/显示离线好友(_S)"
-
-#: src/buddy.c:646
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友(B)/显示空组(_E)"
-
-#: src/buddy.c:647
-msgid "/Buddies/_Add a Buddy..."
-msgstr "/好友(B)/添加好友(_A)..."
-
-#: src/buddy.c:648
-msgid "/Buddies/Add a _Group..."
-msgstr "/好友(B)/添加组(_G)..."
-
-#: src/buddy.c:650
-msgid "/Buddies/_Signoff"
-msgstr "/好友(B)/登出(_S)"
-
-#: src/buddy.c:651
-msgid "/Buddies/_Quit"
-msgstr "/好友(B)/退出(_Q)"
-
-#. Tools
-#: src/buddy.c:654
-msgid "/_Tools"
-msgstr "/工具(_T)"
-
-#: src/buddy.c:655
-msgid "/Tools/_Away"
-msgstr "/工具(T)/离开(_A)"
-
-#: src/buddy.c:656
-msgid "/Tools/Buddy _Pounce"
-msgstr "/工具(T)/好友千里眼(_P)"
-
-#: src/buddy.c:657
-msgid "/Tools/P_rotocol Actions"
-msgstr "/工具(T)/协议操作(_R)"
-
-#: src/buddy.c:659
-msgid "/Tools/A_ccounts..."
-msgstr "/工具(T)/账户(_C)..."
-
-#: src/buddy.c:660
-msgid "/Tools/_File Transfers..."
-msgstr "/工具(T)/文件传送(_F)..."
-
-#: src/buddy.c:661
-msgid "/Tools/Preferences..."
-msgstr "/工具(T)/首选项..."
-
-#: src/buddy.c:662
-msgid "/Tools/Pr_ivacy..."
-msgstr "/工具(T)/隐私(_I)..."
-
-#: src/buddy.c:664
-msgid "/Tools/View System _Log..."
-msgstr "/工具(T)/查看系统日志(_L)..."
-
-#. Help
-#: src/buddy.c:667
-msgid "/_Help"
-msgstr "/帮助(_H)"
-
-#: src/buddy.c:668
-msgid "/Help/Online _Help"
-msgstr "/帮助(H)/在线帮助(_H)"
-
-#: src/buddy.c:669
-msgid "/Help/_Debug Window..."
-msgstr "/帮助(H)/调试窗口(_D)..."
-
-#: src/buddy.c:670
-msgid "/Help/_About..."
-msgstr "/帮助(H)/关于(_A)..."
-
-#: src/buddy.c:707
-#, c-format
-msgid "%dh%02dm"
-msgstr "%d小时%02d分"
-
-#: src/buddy.c:709
-#, c-format
-msgid "%dm"
-msgstr "%d分"
-
-#: src/buddy.c:719
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/buddy.c:729
-msgid ""
-"\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>别名:</b>"
-
-#: src/buddy.c:730
-msgid ""
-"\n"
-"<b>Nickname:</b>"
-msgstr ""
-"\n"
-"<b>昵称:</b>"
-
-#: src/buddy.c:731
-msgid ""
-"\n"
-"<b>Idle:</b>"
-msgstr ""
-"\n"
-"<b>瞌睡:</b>"
-
-#: src/buddy.c:732
-msgid ""
-"\n"
-"<b>Warned:</b>"
-msgstr ""
-"\n"
-"<b>警告:</b>"
-
-#: src/buddy.c:734
-msgid ""
-"\n"
-"<b>Description:</b> Spooky"
-msgstr ""
-"\n"
-"<b>描述:</b> 健谈"
-
-#: src/buddy.c:997
-#, c-format
-msgid "Idle (%dh%02dm) "
-msgstr "瞌睡中 (%d小时%02d分) "
-
-#: src/buddy.c:999
-#, c-format
-msgid "Idle (%dm) "
-msgstr "瞌睡中 (%d分) "
-
-#: src/buddy.c:1003
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "警告 (%d%%) "
-
-#: src/buddy.c:1133 src/prefs.c:1715
-msgid "Buddy List"
-msgstr "好友列表"
-
-#: src/buddy.c:1157
-msgid "/Tools/Away"
-msgstr "/工具(T)/离开(A)"
-
-#: src/buddy.c:1160
-msgid "/Tools/Buddy Pounce"
-msgstr "/工具(T)/好友千里眼(P)"
-
-#: src/buddy.c:1163
-msgid "/Tools/Protocol Actions"
-msgstr "/工具(T)/协议操作(R)"
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: src/buddy.c:1243
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/好友(B)/显示离线好友(S)"
-
-#: src/buddy.c:1245
-msgid "/Buddies/Show Empty Groups"
-msgstr "/好友(B)/显示空组(E)"
-
-#: src/buddy.c:1263 src/gtkconv.c:754
-msgid "IM"
-msgstr "开聊"
-
-#: src/buddy.c:1269
-msgid "Send a message to the selected buddy"
-msgstr "向选中好友发送消息"
-
-#: src/buddy.c:1272
-msgid "Get Info"
-msgstr "信息"
-
-#: src/buddy.c:1278
-msgid "Get information on the selected buddy"
-msgstr "获取选中好友的信息"
-
-#: src/buddy.c:1286
-msgid "Join a chat room"
-msgstr "加入聊天室"
-
-#: src/buddy.c:1294
-msgid "Set an away message"
-msgstr "设置离开消息"
-
-#: src/buddy_chat.c:249
+#: src/buddy_chat.c:249 src/dialogs.c:1405
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3421,6 +3552,10 @@
 msgid "Join Chat"
 msgstr "加入聊天"
 
+#: src/buddy_chat.c:268
+msgid "Buddy Chat"
+msgstr "好友聊天"
+
 #: src/buddy_chat.c:278
 msgid "Join Chat As:"
 msgstr "加入聊天为:"
@@ -3430,52 +3565,52 @@
 msgid "Join"
 msgstr "加入"
 
-#: src/conversation.c:398
+#: src/conversation.c:402
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:404
+#: src/conversation.c:411
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1951
+#: src/conversation.c:1972
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1954
+#: src/conversation.c:1975
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2024
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2046
+#: src/conversation.c:2067
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2048
+#: src/conversation.c:2069
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2253
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2234
+#: src/conversation.c:2255
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2236
+#: src/conversation.c:2257
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2238
+#: src/conversation.c:2259
 msgid "By account"
 msgstr "按账户"
 
@@ -3507,395 +3642,423 @@
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#. b->name is null after remove_buddy
-#: src/dialogs.c:418
-#, c-format
-msgid "Removing '%s' from buddy list.\n"
-msgstr "从好友列表中删除“%s”。\n"
-
-#: src/dialogs.c:457
+#: src/dialogs.c:466
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:458
+#: src/dialogs.c:467
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:464
+#: src/dialogs.c:473
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
+
+#: src/dialogs.c:474
+msgid "Remove Chat"
+msgstr "删除聊天"
+
+#: src/dialogs.c:480
 #, 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/dialogs.c:466
+#: src/dialogs.c:482
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:676
+#: src/dialogs.c:692
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:710
 msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr "您想要跟谁聊?请输入他/她的屏幕名。\n"
-
-#: src/dialogs.c:710 src/dialogs.c:809 src/dialogs.c:3356
+msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
+
+#: src/dialogs.c:726 src/dialogs.c:827 src/dialogs.c:3779
 msgid "_Screenname:"
-msgstr "屏幕名(_S):"
-
-#: src/dialogs.c:725 src/dialogs.c:825 src/gtkpounce.c:454
+msgstr "用户名(_S):"
+
+#: src/dialogs.c:741 src/dialogs.c:843 src/gtkpounce.c:518
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:796
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:797
+#: src/dialogs.c:815
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
-msgstr "您想要查看谁的信息?请输入他/她的屏幕名。\n"
-
-#: src/dialogs.c:974
+msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
+
+#: src/dialogs.c:994
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:991
+#: src/dialogs.c:1011
 msgid "Please enter the name of the group to be added.\n"
 msgstr "请输入要添加的组名称。\n"
 
-#: src/dialogs.c:1000 src/dialogs.c:3930
+#: src/dialogs.c:1020 src/dialogs.c:4328
 msgid "_Group:"
 msgstr "组(_G):"
 
-#: src/dialogs.c:1082
+#: src/dialogs.c:1102
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/dialogs.c:1101
+#: src/dialogs.c:1121
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"您想要将谁加为好友?请输入他/她的屏幕名。您还可为好友输入别名和昵称。只要可能"
-"的话,别名将会替代屏幕名显示。\n"
-
-#: src/dialogs.c:1120
+"您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
+"的话,别名将会替代用户名显示。\n"
+
+#: src/dialogs.c:1140
 msgid "Screen Name"
-msgstr "屏幕名"
-
-#: src/dialogs.c:1133
+msgstr "用户名"
+
+#: src/dialogs.c:1153
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:1143
+#: src/dialogs.c:1163
 msgid "Group"
 msgstr "组"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1152
+#: src/dialogs.c:1172
 msgid "Add To"
 msgstr "添加到"
 
-#: src/dialogs.c:1482
+#: src/dialogs.c:1412
+msgid "Add Chat"
+msgstr "添加聊天"
+
+#: src/dialogs.c:1435
+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/dialogs.c:1444
+msgid "Account:"
+msgstr "账户:"
+
+#: src/dialogs.c:1463 src/multi.c:785
+msgid "Alias:"
+msgstr "别名:"
+
+#: src/dialogs.c:1474
+msgid "Group:"
+msgstr "组:"
+
+#: src/dialogs.c:1807
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/dialogs.c:1493
+#: src/dialogs.c:1818
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
-#: src/dialogs.c:1502
+#: src/dialogs.c:1827
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1844
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/dialogs.c:1523
+#: src/dialogs.c:1848
 msgid "Allow only users on my buddy list"
 msgstr "只允许我的好友联系我"
 
-#: src/dialogs.c:1527
+#: src/dialogs.c:1852
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/dialogs.c:1565
+#: src/dialogs.c:1890
 msgid "Deny all users"
 msgstr "拒绝所有用户"
 
-#: src/dialogs.c:1569
+#: src/dialogs.c:1894
 msgid "Block the users below"
 msgstr "屏蔽以下用户"
 
-#: src/dialogs.c:1684
+#: src/dialogs.c:2009
 msgid "Set Directory Info"
 msgstr "设置目录信息"
 
-#: src/dialogs.c:1692
+#: src/dialogs.c:2017
 msgid "Directory Info"
 msgstr "目录信息"
 
-#: src/dialogs.c:1702
+#: src/dialogs.c:2027
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "设置 %s 的目录信息:"
 
-#: src/dialogs.c:1714
+#: src/dialogs.c:2039
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许搜索引擎查找您的信息"
 
 #. Line 1
-#: src/dialogs.c:1717 src/dialogs.c:2356
+#: src/dialogs.c:2042 src/dialogs.c:2684
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:1728 src/dialogs.c:2366
+#: src/dialogs.c:2053 src/dialogs.c:2694
 msgid "Middle Name"
 msgstr "中名"
 
 #. Line 3
-#: src/dialogs.c:1740 src/dialogs.c:2376
+#: src/dialogs.c:2065 src/dialogs.c:2704
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:1751 src/dialogs.c:2386
+#: src/dialogs.c:2076 src/dialogs.c:2714
 msgid "Maiden Name"
 msgstr "娘家名"
 
 #. Line 6
-#: src/dialogs.c:1773 src/dialogs.c:2405
+#: src/dialogs.c:2098 src/dialogs.c:2733
 msgid "State"
 msgstr "州/省"
 
-#: src/dialogs.c:1815 src/dialogs.c:1986 src/dialogs.c:3118 src/dialogs.c:3825
-#: src/dialogs.c:4600
+#: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
+#: src/dialogs.c:4999
 msgid "Save"
 msgstr "保存"
 
-#: src/dialogs.c:1837
+#: src/dialogs.c:2162
 msgid "New Passwords Do Not Match"
 msgstr "新密码不相同"
 
-#: src/dialogs.c:1842
+#: src/dialogs.c:2167
 msgid "Fill out all fields completely"
 msgstr "完全填入所有字段"
 
-#: src/dialogs.c:1885
+#: src/dialogs.c:2210
 #, c-format
 msgid "Changing password for %s:"
-msgstr "正在更改 %s 的密码:"
-
-#: src/dialogs.c:1893
+msgstr "更改 %s 的密码:"
+
+#: src/dialogs.c:2218
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:1904
+#: src/dialogs.c:2229
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:1915
+#: src/dialogs.c:2240
 msgid "New Password (again)"
-msgstr "再输入新密码"
+msgstr "再次输入新密码"
 
 #. Build OK Button
-#: src/dialogs.c:1926 src/dialogs.c:2058 src/dialogs.c:2337 src/dialogs.c:2483
-#: src/dialogs.c:3522 src/dialogs.c:4027 src/prpl.c:317
+#: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
+#: src/dialogs.c:3945 src/dialogs.c:4425 src/prpl.c:245
 msgid "OK"
 msgstr "确定"
 
-#: src/dialogs.c:1963
+#: src/dialogs.c:2288
 #, c-format
 msgid "Changing info for %s:"
-msgstr "正在更改 %s 的信息:"
-
-#: src/dialogs.c:2044
+msgstr "更改 %s 的信息:"
+
+#: src/dialogs.c:2369
 msgid "Below are the results of your search: "
 msgstr "下面是您搜索的结果:"
 
-#: src/dialogs.c:2149
+#: src/dialogs.c:2477
 msgid "Permit"
 msgstr "许可"
 
-#: src/dialogs.c:2181
+#: src/dialogs.c:2509
 msgid "Add Permit"
 msgstr "添加许可"
 
-#: src/dialogs.c:2183
+#: src/dialogs.c:2511
 msgid "Add Deny"
 msgstr "添加拒绝"
 
-#: src/dialogs.c:2251
+#: src/dialogs.c:2579
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2332 src/dialogs.c:2465
+#: src/dialogs.c:2660 src/dialogs.c:2793
 msgid "Search for Buddy"
 msgstr "搜索好友"
 
-#: src/dialogs.c:2432
+#: src/dialogs.c:2760
 msgid "Find Buddy By Info"
 msgstr "按信息查找好友"
 
-#: src/dialogs.c:2459
+#: src/dialogs.c:2787
 msgid "Find Buddy By Email"
 msgstr "按电子邮件查找好友"
 
-#: src/dialogs.c:2563
+#: src/dialogs.c:2891
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2565
+#: src/dialogs.c:2893
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2584
+#: src/dialogs.c:2912
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
-msgstr ""
-"请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
-
-#: src/dialogs.c:2747 src/dialogs.c:2764
+msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。\n"
+
+#: src/dialogs.c:3077 src/dialogs.c:3094
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:2795 src/dialogs.c:2812
+#: src/dialogs.c:3125 src/dialogs.c:3142
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:2896 src/dialogs.c:2919
+#: src/dialogs.c:3226 src/dialogs.c:3249
 msgid "Select Font"
 msgstr "选择字体"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:2984
+#: src/dialogs.c:3314
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:2985
+#: src/dialogs.c:3315
 msgid ""
-"Please give the message a title, or choose \"Make Away\" to use without "
-"saving."
-msgstr ""
-"请给消息指定标题,或者不保存选择“离开”。"
+"Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:2994
+#: src/dialogs.c:3324
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:3059 src/dialogs.c:3067
+#: src/dialogs.c:3389 src/dialogs.c:3397
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:3077
+#: src/dialogs.c:3407
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:3122
+#: src/dialogs.c:3452
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:3126
+#: src/dialogs.c:3456
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3261
+#: src/dialogs.c:3604
 msgid "Smile!"
-msgstr "笑脸!"
-
-#: src/dialogs.c:3305
+msgstr "笑脸"
+
+#: src/dialogs.c:3650 src/dialogs.c:3728
 msgid "Alias Buddy"
 msgstr "好友别名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3335
+#: src/dialogs.c:3679
+msgid "Please enter an aliased name for this chat.\n"
+msgstr "请输入此聊天的别名。\n"
+
+#: src/dialogs.c:3691 src/dialogs.c:3793
+msgid "_Alias:"
+msgstr "别名(_A):"
+
+#. Setup the label containing the description.
+#: src/dialogs.c:3758
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
-msgstr ""
-"请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
-
-#: src/dialogs.c:3370
-msgid "_Alias:"
-msgstr "别名(_A):"
-
-#: src/dialogs.c:3424 src/dialogs.c:3431
+msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
+
+#: src/dialogs.c:3847 src/dialogs.c:3854
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3455
+#: src/dialogs.c:3878
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3485
+#: src/dialogs.c:3908
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3504
+#: src/dialogs.c:3927
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:3936
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3558
+#: src/dialogs.c:3981
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:3697
+#: src/dialogs.c:4120
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:3699
+#: src/dialogs.c:4122
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:3720
+#: src/dialogs.c:4143
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "无法打开日志文件 %s"
 
-#: src/dialogs.c:3741
+#: src/dialogs.c:4164
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:3798
+#: src/dialogs.c:4221
 msgid "Conversation"
 msgstr "对话"
 
-#: src/dialogs.c:3820
+#: src/dialogs.c:4243
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3904
+#: src/dialogs.c:4302
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:3921
+#: src/dialogs.c:4319
 msgid "Please enter a new name for the selected group.\n"
 msgstr "请输入选中组的新名字。\n"
 
-#: src/dialogs.c:3997 src/dialogs.c:4006
+#: src/dialogs.c:4395 src/dialogs.c:4404
 msgid "Rename Buddy"
 msgstr "重命名好友"
 
-#: src/dialogs.c:4013
+#: src/dialogs.c:4411
 msgid "New name:"
 msgstr "新名字:"
 
@@ -3932,112 +4095,65 @@
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       quit                     Close running copy of Gaim\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [commmand]    Show help for command\n"
 msgstr ""
 "用法:%s 命令 [选项] [URI]\n"
 "\n"
-
-#: src/gaim-remote.c:35
-msgid "    COMMANDS:\n"
-msgstr "    命令:\n"
-
-#: src/gaim-remote.c:36
-msgid "       uri                      Handle AIM: URI\n"
-msgstr "       uri                      处理 AIM:URI\n"
-
-#: src/gaim-remote.c:37
-msgid ""
-"       quit                     Close running copy of Gaim\n"
-"\n"
-msgstr ""
+"    命令:\n"
+"       uri                      处理 AIM: URI\n"
 "       quit                     关闭 Gaim 的运行副本\n"
 "\n"
-
-#: src/gaim-remote.c:39
-msgid "    OPTIONS:\n"
-msgstr "    选项:\n"
-
-#: src/gaim-remote.c:40
-msgid "       -h, --help [commmand]    Show help for command\n"
-msgstr "       -h, --help [命令]        显示命令的帮助\n"
+"    选项:\n"
+"       -h, --help [命令]        显示命令帮助\n"
 
 #: src/gaim-remote.c:136 src/gaim-remote.c:152
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 未运行(会话 0)\n"
 
 #: src/gaim-remote.c:164
-msgid "\n"
-msgstr "\n"
-
-#: src/gaim-remote.c:165
-msgid "Using AIM: URIs:\n"
-msgstr "使用 AIM: URIs:\n"
-
-#: src/gaim-remote.c:166
-msgid "Sending an IM to a screenname:\n"
-msgstr "正在发送即时消息到屏幕名:\n"
-
-#: src/gaim-remote.c:167
-msgid "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-msgstr ""
-
-#: src/gaim-remote.c:168
 msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screenname:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
 "In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
-msgstr ""
-
-#: src/gaim-remote.c:169
-msgid "is the message to be sent.  '+' must be used in place of spaces.\n"
-msgstr ""
-
-#: src/gaim-remote.c:170
-msgid ""
+"is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
-msgstr ""
-
-#: src/gaim-remote.c:171
-msgid "needs to be escaped, or the command will stop at that point.\n"
-msgstr ""
-
-#: src/gaim-remote.c:172
-msgid ""
+"needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
-msgstr ""
-
-#: src/gaim-remote.c:173
-msgid "with no message:\n"
-msgstr ""
-
-#: src/gaim-remote.c:174
-msgid ""
+"with no message:\n"
 "\tgaim-remote uri aim:goim?screenname=Penguin\n"
 "\n"
-msgstr ""
-
-#: src/gaim-remote.c:175
-msgid "Joining a chat:\n"
-msgstr ""
-
-#: src/gaim-remote.c:176
-msgid "\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
-msgstr ""
-
-#: src/gaim-remote.c:177
-msgid ""
+"Joining a chat:\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
-msgstr ""
-
-#: src/gaim-remote.c:178
-msgid "Adding a buddy to your buddy list:\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
-
-#: src/gaim-remote.c:179
-msgid "\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
-msgstr ""
-
-#: src/gaim-remote.c:180
-msgid "...prompts you to add 'Penguin' to your buddy list.\n"
-msgstr ""
+"\n"
+"使用 AIM: URIs:\n"
+"给用户名发送即时消息:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"在这种情况下,“Penguin”就是想要开聊的用户名,而“hello world”是\n"
+"想要发送的消息。“+”用来替代空格。请注意上面使用的内容 - 如果您想\n"
+"要从 shell 运行此命令,“&”就必须转码,否则命令将会在该处停止。\n"
+"同时,下列命令将打开和用户名开聊的对话窗口,而不发送消息:\n"
+"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\n"
+"加入聊天:\n"
+"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"...加入“PenguinLounge”聊天室。\n"
+"\n"
+"添加好友:\n"
+"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"...提示您将“Penguin”加为好友。\n"
 
 #: src/gaim-remote.c:184
 msgid ""
@@ -4052,256 +4168,541 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:291 src/gaimrc.c:324 src/gaimrc.c:1447
+#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1448
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1540
+#: src/gaimrc.c:1546
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkconv.c:217
+#: src/gaimrc.c:1603
+msgid "Unable to Save Preferences"
+msgstr "无法保存首选项"
+
+#: src/gaimrc.c:1603
+msgid ""
+"Gaim was unable to save your preferences.  Please verify that you have "
+"enough free space."
+msgstr "Gaim 无法保存您的首选项。请检查您是否有足够的剩余空间。"
+
+#: src/gtkblist.c:382
+msgid "_Add a Buddy"
+msgstr "添加好友(_A)"
+
+#: src/gtkblist.c:383
+msgid "Add a C_hat"
+msgstr "添加聊天(_H)"
+
+#: src/gtkblist.c:384
+msgid "_Delete Group"
+msgstr "删除组(_D)"
+
+#: src/gtkblist.c:385
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: src/gtkblist.c:387
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: src/gtkblist.c:388 src/gtkblist.c:419
+msgid "_Alias"
+msgstr "别名(_A)"
+
+#: src/gtkblist.c:389 src/gtkblist.c:420
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: src/gtkblist.c:398
+msgid "_Get Info"
+msgstr "获取信息(_G)"
+
+#: src/gtkblist.c:400
+msgid "_IM"
+msgstr "开聊(_I)"
+
+#: src/gtkblist.c:401
+msgid "Add Buddy _Pounce"
+msgstr "添加好友千里眼(_P)"
+
+#: src/gtkblist.c:402
+msgid "View _Log"
+msgstr "查看日志(_L)"
+
+#. Buddies menu
+#: src/gtkblist.c:733
+msgid "/_Buddies"
+msgstr "/好友(_B)"
+
+#: src/gtkblist.c:734
+msgid "/Buddies/New _Instant Message..."
+msgstr "/好友(B)/新即时消息(_I)..."
+
+#: src/gtkblist.c:735
+msgid "/Buddies/Join a _Chat..."
+msgstr "/好友(B)/加入聊天(_C)..."
+
+#: src/gtkblist.c:736
+msgid "/Buddies/Get _User Info..."
+msgstr "/好友(B)/获取用户信息(_U)..."
+
+#: src/gtkblist.c:738
+msgid "/Buddies/_Show Offline Buddies"
+msgstr "/好友(B)/显示离线好友(_S)"
+
+#: src/gtkblist.c:739
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/好友(B)/显示空组(_E)"
+
+#: src/gtkblist.c:740
+msgid "/Buddies/_Add a Buddy..."
+msgstr "/好友(B)/添加好友(_A)..."
+
+#: src/gtkblist.c:741
+msgid "/Buddies/Add a C_hat..."
+msgstr "/好友(B)/添加聊天(_H)..."
+
+#: src/gtkblist.c:742
+msgid "/Buddies/Add a _Group..."
+msgstr "/好友(B)/添加组(_G)..."
+
+#: src/gtkblist.c:744
+msgid "/Buddies/_Signoff"
+msgstr "/好友(B)/登出(_S)"
+
+#: src/gtkblist.c:745
+msgid "/Buddies/_Quit"
+msgstr "/好友(B)/退出(_Q)"
+
+#. Tools
+#: src/gtkblist.c:748
+msgid "/_Tools"
+msgstr "/工具(_T)"
+
+#: src/gtkblist.c:749
+msgid "/Tools/_Away"
+msgstr "/工具(T)/离开(_A)"
+
+#: src/gtkblist.c:750
+msgid "/Tools/Buddy _Pounce"
+msgstr "/工具(T)/好友千里眼(_P)"
+
+#: src/gtkblist.c:751
+msgid "/Tools/P_rotocol Actions"
+msgstr "/工具(T)/协议操作(_R)"
+
+#: src/gtkblist.c:753
+msgid "/Tools/A_ccounts..."
+msgstr "/工具(T)/账户(_C)..."
+
+#: src/gtkblist.c:754
+msgid "/Tools/_File Transfers..."
+msgstr "/工具(T)/文件传送(_F)..."
+
+#: src/gtkblist.c:755
+msgid "/Tools/Preferences..."
+msgstr "/工具(T)/首选项..."
+
+#: src/gtkblist.c:756
+msgid "/Tools/Pr_ivacy..."
+msgstr "/工具(T)/隐私(_I)..."
+
+#: src/gtkblist.c:758
+msgid "/Tools/View System _Log..."
+msgstr "/工具(T)/查看系统日志(_L)..."
+
+#. Help
+#: src/gtkblist.c:761
+msgid "/_Help"
+msgstr "/帮助(_H)"
+
+#: src/gtkblist.c:762
+msgid "/Help/Online _Help"
+msgstr "/帮助(H)/在线帮助(_H)"
+
+#: src/gtkblist.c:763
+msgid "/Help/_Debug Window..."
+msgstr "/帮助(H)/调试窗口(_D)..."
+
+#: src/gtkblist.c:764
+msgid "/Help/_About..."
+msgstr "/帮助(H)/关于(_A)..."
+
+#: src/gtkblist.c:798
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>账户:</b>%s"
+
+#: src/gtkblist.c:857
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:871
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>账户:</b>"
+
+#: src/gtkblist.c:872
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>别名:</b>"
+
+#: src/gtkblist.c:873
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>昵称:</b>"
+
+#: src/gtkblist.c:874
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>瞌睡:</b>"
+
+#: src/gtkblist.c:875
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>警告:</b>"
+
+#: src/gtkblist.c:877
+msgid ""
+"\n"
+"<b>Description:</b> Spooky"
+msgstr ""
+"\n"
+"<b>描述:</b>健谈"
+
+#: src/gtkblist.c:1169
+#, c-format
+msgid "Idle (%dh%02dm) "
+msgstr "瞌睡中 (%d小时%02d分) "
+
+#: src/gtkblist.c:1171
+#, c-format
+msgid "Idle (%dm) "
+msgstr "瞌睡中 (%d分) "
+
+#: src/gtkblist.c:1175
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "警告 (%d%%) "
+
+#: src/gtkblist.c:1332 src/prefs.c:1787
+msgid "Buddy List"
+msgstr "好友列表"
+
+#: src/gtkblist.c:1356
+msgid "/Tools/Away"
+msgstr "/工具(T)/离开(A)"
+
+#: src/gtkblist.c:1359
+msgid "/Tools/Buddy Pounce"
+msgstr "/工具(T)/好友千里眼(P)"
+
+#: src/gtkblist.c:1362
+msgid "/Tools/Protocol Actions"
+msgstr "/工具(T)/协议操作(R)"
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: src/gtkblist.c:1442
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/好友(B)/显示离线好友(S)"
+
+#: src/gtkblist.c:1444
+msgid "/Buddies/Show Empty Groups"
+msgstr "/好友(B)/显示空组(E)"
+
+#: src/gtkblist.c:1462 src/gtkconv.c:765
+msgid "IM"
+msgstr "开聊"
+
+#: src/gtkblist.c:1468
+msgid "Send a message to the selected buddy"
+msgstr "向选中好友发送消息"
+
+#: src/gtkblist.c:1471
+msgid "Get Info"
+msgstr "信息"
+
+#: src/gtkblist.c:1477
+msgid "Get information on the selected buddy"
+msgstr "获取选中好友的信息"
+
+#: src/gtkblist.c:1485
+msgid "Join a chat room"
+msgstr "加入聊天室"
+
+#: src/gtkblist.c:1493
+msgid "Set an away message"
+msgstr "设置离开消息"
+
+#: src/gtkconv.c:218
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:773
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:764 src/prefs.c:526
+#: src/gtkconv.c:775 src/prefs.c:541
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:773 src/gtkconv.c:2655
+#: src/gtkconv.c:784 src/gtkconv.c:2668
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:867
+#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3781
+msgid "Remove"
+msgstr "删除"
+
+#: src/gtkconv.c:878
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:895
+#: src/gtkconv.c:906
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:916
+#: src/gtkconv.c:927
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:936
+#: src/gtkconv.c:947
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1963
+#: src/gtkconv.c:1976
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:1971
+#: src/gtkconv.c:1984
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2078
+#: src/gtkconv.c:2091
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:2528
+#: src/gtkconv.c:2541
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2529
+#: src/gtkconv.c:2542
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2531
+#: src/gtkconv.c:2544
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2533
+#: src/gtkconv.c:2546
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2535
+#: src/gtkconv.c:2548
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2538
+#: src/gtkconv.c:2551
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2555
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2543
+#: src/gtkconv.c:2556
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2580
+#: src/gtkconv.c:2593
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2582
+#: src/gtkconv.c:2595
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2584
+#: src/gtkconv.c:2597
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2586
+#: src/gtkconv.c:2599
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2588
+#: src/gtkconv.c:2601
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2612 src/gtkconv.c:2614 src/gtkconv.c:2712 src/gtkconv.c:2714
-#: src/gtkconv.c:4997
+#: src/gtkconv.c:2625 src/gtkconv.c:2627 src/gtkconv.c:2725 src/gtkconv.c:2727
+#: src/gtkconv.c:5019
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2635 src/gtkconv.c:3773
+#: src/gtkconv.c:2648 src/gtkconv.c:3793
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2641 src/gtkconv.c:3764
+#: src/gtkconv.c:2654 src/gtkconv.c:3784
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2648
+#: src/gtkconv.c:2661
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2652
+#: src/gtkconv.c:2665
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2659 src/gtkconv.c:3086
+#: src/gtkconv.c:2672 src/gtkconv.c:3103
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:2662
+#: src/gtkconv.c:2675
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:2666
+#: src/gtkconv.c:2679
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:2724 src/gtkconv.c:5000
+#: src/gtkconv.c:2737 src/gtkconv.c:5022
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:2727
+#: src/gtkconv.c:2740
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:2766
+#: src/gtkconv.c:2779
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:2777
+#: src/gtkconv.c:2790
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2801
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2817
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2829
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:2828
+#: src/gtkconv.c:2841
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:2845
+#: src/gtkconv.c:2858
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2870
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:2869
+#: src/gtkconv.c:2882
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2897
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:2895
+#: src/gtkconv.c:2908
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:2919
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:2959
+#: src/gtkconv.c:2976
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3006
+#: src/gtkconv.c:3023
 msgid "0 people in room"
-msgstr "聊天室里有 0 人"
-
-#: src/gtkconv.c:3063
+msgstr "聊天室里没有人"
+
+#: src/gtkconv.c:3080
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3075
+#: src/gtkconv.c:3092
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3623
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4205 src/gtkconv.c:4327
+#: src/gtkconv.c:4225 src/gtkconv.c:4347
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "聊天室里有 %d 人"
-
-#: src/gtkconv.c:4686
+msgstr[0] "聊天室里有 %d 个人"
+
+#: src/gtkconv.c:4707
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:4695
+#: src/gtkconv.c:4716
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:4702
+#: src/gtkconv.c:4723
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:4708
+#: src/gtkconv.c:4729
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
@@ -4402,12 +4803,8 @@
 msgstr "无法发送 0 字节的文件。"
 
 #: src/gtkft.c:1028
-msgid "That file already exists. "
-msgstr "该文件已经存在。"
-
-#: src/gtkft.c:1029
-msgid "Would you like to overwrite it?"
-msgstr "您是否想要覆盖?"
+msgid "That file already exists. Would you like to overwrite it?"
+msgstr "该文件已存在。您是否想要覆盖?"
 
 #: src/gtkft.c:1054
 msgid "Gaim - Open..."
@@ -4426,151 +4823,163 @@
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1648
+#: src/gtkimhtml.c:1664
 msgid ""
 "Gaim was unable to guess the image type base on the file extension "
 "supplied.  Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1656
+#: src/gtkimhtml.c:1672
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1665
+#: src/gtkimhtml.c:1681
 msgid "Gaim - Save Image"
 msgstr "Gaim - 保存图像"
 
-#: src/gtkimhtml.c:1687
+#: src/gtkimhtml.c:1703
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkpounce.c:108
+#: src/gtkpounce.c:121
+msgid "Select a file"
+msgstr "选择文件"
+
+#: src/gtkpounce.c:170
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#: src/gtkpounce.c:280
+#: src/gtkpounce.c:342
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 开始向您打字"
 
-#: src/gtkpounce.c:281
+#: src/gtkpounce.c:343
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已登入"
 
-#: src/gtkpounce.c:282
+#: src/gtkpounce.c:344
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 睡醒了"
 
-#: src/gtkpounce.c:283
+#: src/gtkpounce.c:345
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 回来了"
 
-#: src/gtkpounce.c:284
+#: src/gtkpounce.c:346
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止了给您打字"
 
-#: src/gtkpounce.c:285
+#: src/gtkpounce.c:347
 #, c-format
 msgid "%s has signed off"
 msgstr "%d 已登出"
 
-#: src/gtkpounce.c:286
+#: src/gtkpounce.c:348
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 打起瞌睡"
 
-#: src/gtkpounce.c:287
+#: src/gtkpounce.c:349
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
 
-#: src/gtkpounce.c:288
+#: src/gtkpounce.c:350
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:429 src/gtkpounce.c:781
+#: src/gtkpounce.c:493 src/gtkpounce.c:883
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:429
+#: src/gtkpounce.c:493
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:447
+#: src/gtkpounce.c:511
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:469
+#: src/gtkpounce.c:533
 msgid "_Buddy Name:"
 msgstr "好友(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:488
+#: src/gtkpounce.c:552
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:496
+#: src/gtkpounce.c:560
 msgid "Sign on"
 msgstr "登入"
 
-#: src/gtkpounce.c:498
+#: src/gtkpounce.c:562
 msgid "Sign off"
 msgstr "登出"
 
-#: src/gtkpounce.c:502
+#: src/gtkpounce.c:566
 msgid "Return from away"
 msgstr "回来"
 
-#: src/gtkpounce.c:506
+#: src/gtkpounce.c:570
 msgid "Return from idle"
 msgstr "睡醒了"
 
-#: src/gtkpounce.c:508
+#: src/gtkpounce.c:572
 msgid "Buddy starts typing"
 msgstr "好友开始打字"
 
-#: src/gtkpounce.c:510
+#: src/gtkpounce.c:574
 msgid "Buddy stops typing"
 msgstr "好友停止打字"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:539
+#: src/gtkpounce.c:603
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:546
+#: src/gtkpounce.c:610
 msgid "Open an IM window"
 msgstr "打开即时消息窗口"
 
-#: src/gtkpounce.c:547
+#: src/gtkpounce.c:611
 msgid "Popup notification"
 msgstr "弹出通知"
 
-#: src/gtkpounce.c:548
+#: src/gtkpounce.c:612
 msgid "Send a message"
 msgstr "发送消息"
 
-#: src/gtkpounce.c:549
+#: src/gtkpounce.c:613
 msgid "Execute a command"
 msgstr "执行命令"
 
-#: src/gtkpounce.c:550
+#: src/gtkpounce.c:614
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: src/gtkpounce.c:605
+#: src/gtkpounce.c:618 src/gtkpounce.c:620 src/multi.c:678
+msgid "Browse"
+msgstr "浏览"
+
+#: src/gtkpounce.c:621 src/prefs.c:1614
+msgid "Test"
+msgstr "测试"
+
+#: src/gtkpounce.c:704
 msgid "_Save this pounce after activation"
 msgstr "激活后保存此千里眼(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:788
+#: src/gtkpounce.c:890
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
@@ -4578,56 +4987,10 @@
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 保存图标"
 
-#: src/html.c:285
-#, c-format
-msgid "Received: '%s'\n"
-msgstr "收到了:“%s”\n"
-
-#: src/html.c:323
+#: src/html.c:326
 msgid "g003: Error opening connection.\n"
 msgstr "g003:打开连接出错。\n"
 
-#: src/list.c:417
-#, c-format
-msgid ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies, and the group were not removed.\n"
-msgstr ""
-"%2$s 组中的 %1:d 个好友未删除,原因是他们的账户未登入。"
-"这些好友和该组不会被删除。\n"
-
-#: src/list.c:421
-msgid "Group Not Removed"
-msgstr "组未删除"
-
-#: src/list.c:556
-msgid "Invalid Groupname"
-msgstr "组名无效"
-
-#: src/list.c:1205
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr ""
-"处理您的好友列表时出错。好友列表未装入。"
-
-#: src/list.c:1207
-msgid "Buddy List Error"
-msgstr "好友列表出错"
-
-#. rob wants to inform the user that their buddy lists are
-#. * being converted
-#: src/list.c:1213
-#, c-format
-msgid ""
-"Gaim is converting your old buddy lists to a new format, which will now be "
-"located at %s"
-msgstr ""
-"Gaim 正在将您旧的好友列表转换为新格式,并存放在 %s"
-
-#: src/list.c:1216
-msgid "Converting Buddy List"
-msgstr "正在转换好友列表"
-
 #: src/log.c:118
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 保存对话"
@@ -4742,145 +5105,137 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
 
-#: src/main.c:177
+#: src/main.c:181
 msgid "Please enter your login."
 msgstr "请输入您的登录名。"
 
-#: src/main.c:264
+#: src/main.c:270
 msgid "<New User>"
 msgstr "<新用户>"
 
-#: src/main.c:306
+#: src/main.c:312
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:322
+#: src/main.c:328
 msgid "Screen Name:"
-msgstr "屏幕名:"
+msgstr "用户名:"
 
 #. And now for the buttons
-#: src/main.c:356
+#: src/main.c:362
 msgid "Accounts"
 msgstr "账户"
 
-#: src/main.c:366 src/prefs.c:1770 src/win32/systray.c:294
+#: src/main.c:372 src/prefs.c:1854 src/win32/systray.c:294
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/main.c:372 src/win32/systray.c:146
+#: src/main.c:378 src/win32/systray.c:146
 msgid "Sign On"
 msgstr "登入"
 
 #: src/multi.c:264
 msgid "Screenname"
-msgstr "屏幕名"
+msgstr "用户名"
 
 #: src/multi.c:292
 msgid "Protocol"
 msgstr "协议"
 
-#: src/multi.c:618
+#: src/multi.c:621
 msgid "Load Buddy Icon"
 msgstr "装入好友图标"
 
-#: src/multi.c:661
+#: src/multi.c:665
 msgid "Buddy Icon File:"
 msgstr "好友图标文件:"
 
-#: src/multi.c:674
-msgid "Browse"
-msgstr "浏览"
-
-#: src/multi.c:679 src/prefs.c:1546
+#: src/multi.c:684 src/prefs.c:1618
 msgid "Reset"
 msgstr "重置"
 
-#: src/multi.c:705
+#: src/multi.c:711
 msgid "Login Options"
 msgstr "登入选项"
 
-#: src/multi.c:717
+#: src/multi.c:723
 msgid "Protocol:"
 msgstr "协议:"
 
-#: src/multi.c:731
+#: src/multi.c:738
 msgid "Screenname:"
-msgstr "屏幕名:"
-
-#: src/multi.c:778
-msgid "Alias:"
-msgstr "别名:"
-
-#: src/multi.c:786
+msgstr "用户名:"
+
+#: src/multi.c:793
 msgid "Remember Password"
 msgstr "记住密码"
 
-#: src/multi.c:787
+#: src/multi.c:794
 msgid "Auto-Login"
 msgstr "自动登入"
 
-#: src/multi.c:843
+#: src/multi.c:851
 msgid "User Options"
 msgstr "用户选项"
 
-#: src/multi.c:853
+#: src/multi.c:861
 msgid "New Mail Notifications"
 msgstr "新邮件通知"
 
-#: src/multi.c:905
+#: src/multi.c:922
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
-#: src/multi.c:948
+#: src/multi.c:966
 msgid "Register with server"
 msgstr "注册服务器"
 
-#: src/multi.c:981
+#: src/multi.c:999
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: src/multi.c:995
+#: src/multi.c:1013
 msgid "Proxy _Type"
 msgstr "代理类型(_T)"
 
-#: src/multi.c:1004
+#: src/multi.c:1022
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
-#: src/multi.c:1013
+#: src/multi.c:1031
 msgid "No Proxy"
 msgstr "无代理"
 
-#: src/multi.c:1065
+#: src/multi.c:1083
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: src/multi.c:1101
+#: src/multi.c:1119
 msgid "_User:"
 msgstr "用户名(_U):"
 
-#: src/multi.c:1117
+#: src/multi.c:1135
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: src/multi.c:1188
+#: src/multi.c:1208
 msgid "Modify Account"
 msgstr "修改账户"
 
-#: src/multi.c:1206
+#: src/multi.c:1227
 msgid "Show more options"
 msgstr "显示全部选项"
 
-#: src/multi.c:1206
+#: src/multi.c:1227
 msgid "Show fewer options"
 msgstr "显示主要选项"
 
-#: src/multi.c:1315
+#: src/multi.c:1338
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: src/multi.c:1333
+#: src/multi.c:1356
 #, c-format
 msgid ""
 "Please enter your password for %s.\n"
@@ -4889,69 +5244,68 @@
 "请输入您作为 %s 的密码。\n"
 "\n"
 
-#: src/multi.c:1344
+#: src/multi.c:1367
 msgid "_Password"
 msgstr "密码(_P)"
 
-#: src/multi.c:1383
+#: src/multi.c:1418
 msgid "TOC not found."
 msgstr "TOC 未找到。"
 
-#: src/multi.c:1384
+#: src/multi.c:1419
 msgid ""
 "You have attempted to login an IM account using the TOC protocol.  Because "
 "this protocol is inferior to OSCAR, it is now compiled as a plugin by "
 "default.  To login, edit this account to use OSCAR or load the TOC plugin."
 msgstr ""
-"您试图使用 TOC 协议登入即时通讯账户。"
-"由于此协议优先于 OSCAR,所以该协议现在默认被编译为插件。"
-"如果要登入的话,请编辑此账户使用 OSCAR 或者装入 TOC 插件。"
-
-#: src/multi.c:1390
+"您试图使用 TOC 协议登入即时通讯账户。由于此协议优先于 OSCAR,所以该协议现在默"
+"认被编译为插件。如果要登入的话,请编辑此账户使用 OSCAR 或者装入 TOC 插件。"
+
+#: src/multi.c:1425
 msgid "Protocol not found."
 msgstr "协议未找到。"
 
-#: src/multi.c:1391
+#: src/multi.c:1426
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
-"您无法登入此账户;您没有装入该帐户所使用的协议,或者该协议未提供登录功能。"
-
-#: src/multi.c:1467
+"您无法登入此账户;您没有装入该账户所使用的协议,或者该协议未提供登录功能。"
+
+#: src/multi.c:1505
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: src/multi.c:1468
+#: src/multi.c:1506
 msgid "Delete"
 msgstr "删除"
 
-#: src/multi.c:1497
+#: src/multi.c:1535
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: src/multi.c:1562
+#: src/multi.c:1574
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/multi.c:1610
+#: src/multi.c:1624
 msgid "Done."
 msgstr "完成。"
 
-#: src/multi.c:1840
+#: src/multi.c:1860
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/multi.c:1898
+#: src/multi.c:1919
 msgid "Signon"
 msgstr "登入"
 
-#: src/multi.c:1910
+#: src/multi.c:1931
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/multi.c:1963
+#: src/multi.c:1986
 #, c-format
 msgid ""
 "%s\n"
@@ -4960,499 +5314,495 @@
 "%s\n"
 "%s:%s"
 
-#: src/multi.c:1984
+#: src/multi.c:2008
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s 无法登入"
 
-#: src/multi.c:1985
+#: src/multi.c:2009
 msgid "Signon Error"
 msgstr "登入出错"
 
-#: src/multi.c:1996
+#: src/multi.c:2020
 msgid "Notice"
 msgstr "注意"
 
-#: src/multi.c:2008
+#: src/multi.c:2032
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 已经登出"
 
-#: src/multi.c:2009
+#: src/multi.c:2033
 msgid "Connection Error"
 msgstr "连接错误"
 
-#: src/perl.c:386
-msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
-msgstr "GAIM::register 调用参数不对。请参考 PERL-HOWTO。"
-
-#: src/prefs.c:193
+#: src/prefs.c:205
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/prefs.c:195
+#: src/prefs.c:207
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/prefs.c:374
+#: src/prefs.c:388
 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/prefs.c:407
+#: src/prefs.c:421
 msgid "Icon"
 msgstr "图标"
 
-#: src/prefs.c:441
+#: src/prefs.c:455
 msgid "Style"
 msgstr "样式"
 
-#: src/prefs.c:442
+#: src/prefs.c:456
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/prefs.c:443
+#: src/prefs.c:457
 msgid "_Italics"
 msgstr "斜体(_I)"
 
-#: src/prefs.c:444
+#: src/prefs.c:458
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: src/prefs.c:445
+#: src/prefs.c:459
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/prefs.c:447
+#: src/prefs.c:461
 msgid "Face"
 msgstr "字体"
 
-#: src/prefs.c:450
+#: src/prefs.c:464
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/prefs.c:464
+#: src/prefs.c:478
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/prefs.c:472
+#: src/prefs.c:486
 msgid "Color"
 msgstr "颜色"
 
-#: src/prefs.c:477
+#: src/prefs.c:491
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/prefs.c:494
+#: src/prefs.c:508
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/prefs.c:519 src/prefs.c:662 src/prefs.c:703
+#: src/prefs.c:534 src/prefs.c:676 src/prefs.c:717
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs.c:520
+#: src/prefs.c:535
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/prefs.c:521
+#: src/prefs.c:536
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/prefs.c:522
+#: src/prefs.c:537
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/prefs.c:524
+#: src/prefs.c:539
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/prefs.c:527
+#: src/prefs.c:542
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/prefs.c:528
+#: src/prefs.c:543
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/prefs.c:529
-msgid "Ignore font si_zes"
-msgstr "忽略字体大小(_Z)"
-
-#: src/prefs.c:542
-msgid "Send Message"
-msgstr "发送消息"
-
-#: src/prefs.c:543
-msgid "_Enter sends message"
-msgstr "回车键发送消息(_E)"
-
 #: src/prefs.c:544
+msgid "Ignore font si_zes"
+msgstr "忽略字体大小(_Z)"
+
+#: src/prefs.c:556
+msgid "Send Message"
+msgstr "发送消息"
+
+#: src/prefs.c:557
+msgid "_Enter sends message"
+msgstr "回车键发送消息(_E)"
+
+#: src/prefs.c:558
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/prefs.c:546
+#: src/prefs.c:560
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/prefs.c:547
+#: src/prefs.c:561
 msgid "E_scape closes window"
 msgstr "Esc 键关闭窗口(_S)"
 
-#: src/prefs.c:548
+#: src/prefs.c:562
 msgid "Control-_W closes window"
 msgstr "Ctrl+W 键关闭窗口(_W)"
 
-#: src/prefs.c:551
+#: src/prefs.c:565
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
 
-#: src/prefs.c:552
+#: src/prefs.c:566
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl+数字键插入笑脸(_S)"
 
-#: src/prefs.c:565
+#: src/prefs.c:579
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/prefs.c:566 src/prefs.c:645 src/prefs.c:688
+#: src/prefs.c:580 src/prefs.c:659 src/prefs.c:702
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/prefs.c:567 src/prefs.c:646 src/prefs.c:689
+#: src/prefs.c:581 src/prefs.c:660 src/prefs.c:703
 msgid "Pictures"
 msgstr "图片"
 
-#: src/prefs.c:568 src/prefs.c:647 src/prefs.c:690
+#: src/prefs.c:582 src/prefs.c:661 src/prefs.c:704
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:569 src/prefs.c:648 src/prefs.c:691
+#: src/prefs.c:583 src/prefs.c:662 src/prefs.c:705
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/prefs.c:570 src/prefs.c:1075
+#: src/prefs.c:584 src/prefs.c:1090
 msgid "None"
 msgstr "无"
 
-#: src/prefs.c:573
+#: src/prefs.c:587
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:575
+#: src/prefs.c:589
 msgid "Group Display"
 msgstr "组显示"
 
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:577
+#: src/prefs.c:591
 msgid "Show _numbers in groups"
 msgstr "在组旁显示数字(_N)"
 
-#: src/prefs.c:579
+#: src/prefs.c:593
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/prefs.c:580
+#: src/prefs.c:594
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/prefs.c:581
+#: src/prefs.c:595
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/prefs.c:586
+#: src/prefs.c:600
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/prefs.c:591
+#: src/prefs.c:605
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/prefs.c:609 src/prefs.c:1716
+#: src/prefs.c:623 src/prefs.c:1788
 msgid "Conversations"
 msgstr "对话"
 
-#: src/prefs.c:617
+#: src/prefs.c:631
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/prefs.c:625
+#: src/prefs.c:639
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)。"
 
-#: src/prefs.c:644 src/prefs.c:687
+#: src/prefs.c:658 src/prefs.c:701
 msgid "Window"
 msgstr "窗口"
 
-#: src/prefs.c:651 src/prefs.c:694
+#: src/prefs.c:665 src/prefs.c:708
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/prefs.c:652 src/prefs.c:695
+#: src/prefs.c:666 src/prefs.c:709
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/prefs.c:653 src/prefs.c:696
-msgid "_Entry widget height:"
+#: src/prefs.c:667 src/prefs.c:710
+msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/prefs.c:654 src/prefs.c:697
+#: src/prefs.c:668 src/prefs.c:711
 msgid "_Raise windows on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:655
+#: src/prefs.c:669
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/prefs.c:658
+#: src/prefs.c:672
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/prefs.c:659
+#: src/prefs.c:673
 msgid "Hide buddy _icons"
 msgstr "隐藏好友图标(_I)"
 
-#: src/prefs.c:660
+#: src/prefs.c:674
 msgid "Disable buddy icon a_nimation"
 msgstr "禁用好友图标动画(_N)"
 
-#: src/prefs.c:663
+#: src/prefs.c:677
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/prefs.c:664
+#: src/prefs.c:678
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/prefs.c:666
+#: src/prefs.c:680
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/prefs.c:667
+#: src/prefs.c:681
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/prefs.c:699
+#: src/prefs.c:713
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/prefs.c:700
+#: src/prefs.c:714
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/prefs.c:701
+#: src/prefs.c:715
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/prefs.c:704
+#: src/prefs.c:718
 msgid "_Show people joining/leaving in window"
 msgstr "在窗口中显示加入/离开的人(_S)"
 
-#: src/prefs.c:705
+#: src/prefs.c:719
 msgid "Co_lorize screennames"
-msgstr "屏幕名着色(_L)"
-
-#: src/prefs.c:722
+msgstr "用户名着色(_L)"
+
+#: src/prefs.c:736
 msgid "IM Tabs"
 msgstr "即时消息标签"
 
-#: src/prefs.c:723 src/prefs.c:733
+#: src/prefs.c:737 src/prefs.c:747
 msgid "Tab _placement:"
 msgstr "标签位置(_P):"
 
-#: src/prefs.c:724 src/prefs.c:734
+#: src/prefs.c:738 src/prefs.c:748
 msgid "Top"
 msgstr "上"
 
-#: src/prefs.c:725 src/prefs.c:735
+#: src/prefs.c:739 src/prefs.c:749
 msgid "Bottom"
 msgstr "下"
 
-#: src/prefs.c:726 src/prefs.c:736
+#: src/prefs.c:740 src/prefs.c:750
 msgid "Left"
 msgstr "左"
 
-#: src/prefs.c:727 src/prefs.c:737
+#: src/prefs.c:741 src/prefs.c:751
 msgid "Right"
 msgstr "右"
 
-#: src/prefs.c:729
+#: src/prefs.c:743
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
-msgstr "在一个标签窗口内显示所有的即时消息(_I)"
-
-#: src/prefs.c:732
+msgstr "在一个标签式窗口内显示所有即时消息(_I)"
+
+#: src/prefs.c:746
 msgid "Chat Tabs"
 msgstr "聊天标签"
 
-#: src/prefs.c:739
+#: src/prefs.c:753
 msgid "Show all c_hats in one tabbed window"
-msgstr "在一个标签窗口内显示所有的聊天(_H)"
-
-#: src/prefs.c:742
+msgstr "在一个标签窗口内显示所有聊天(_H)"
+
+#: src/prefs.c:756
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/prefs.c:743
+#: src/prefs.c:757
 msgid "Show _close button on tabs."
 msgstr "在标签上显示关闭按钮(_C)。"
 
-#: src/prefs.c:763
+#: src/prefs.c:777
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/prefs.c:764
+#: src/prefs.c:778
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/prefs.c:765
+#: src/prefs.c:779
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/prefs.c:770
+#: src/prefs.c:784
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/prefs.c:783
-msgid "_Host"
-msgstr "主机(_H)"
-
 #: src/prefs.c:797
+msgid "_Host"
+msgstr "主机(_H)"
+
+#: src/prefs.c:811
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:813
+#: src/prefs.c:827
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/prefs.c:827
+#: src/prefs.c:841
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/prefs.c:848
+#: src/prefs.c:862
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "输入的手动浏览器“%s”无效。超级链接无法工作。"
 
-#: src/prefs.c:869
+#: src/prefs.c:883
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/prefs.c:870
+#: src/prefs.c:884
 msgid "Opera"
 msgstr "Opera"
 
-#: src/prefs.c:871
+#: src/prefs.c:885
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:872
+#: src/prefs.c:886
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:873
+#: src/prefs.c:887
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/prefs.c:881
+#: src/prefs.c:895
 msgid "Manual"
 msgstr "手动"
 
-#: src/prefs.c:905
+#: src/prefs.c:919
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/prefs.c:909
+#: src/prefs.c:923
 msgid "_Browser"
 msgstr "浏览器(_B)"
 
-#: src/prefs.c:917
+#: src/prefs.c:931
 msgid "_Manual: "
 msgstr "手动(_M):"
 
-#: src/prefs.c:932
+#: src/prefs.c:946
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/prefs.c:933
+#: src/prefs.c:947
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/prefs.c:947
+#: src/prefs.c:961
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/prefs.c:948
+#: src/prefs.c:962
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/prefs.c:949
+#: src/prefs.c:963
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/prefs.c:950
+#: src/prefs.c:964
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/prefs.c:952
+#: src/prefs.c:966
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/prefs.c:953
+#: src/prefs.c:967
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/prefs.c:955
+#: src/prefs.c:969
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡(_I)"
 
-#: src/prefs.c:957
+#: src/prefs.c:971
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/prefs.c:958
+#: src/prefs.c:972
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/prefs.c:960
+#: src/prefs.c:974
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/prefs.c:993
+#: src/prefs.c:1007
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/prefs.c:994
+#: src/prefs.c:1008
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/prefs.c:995
+#: src/prefs.c:1009
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/prefs.c:998
+#: src/prefs.c:1012
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/prefs.c:999
+#: src/prefs.c:1013
 msgid "_Method"
 msgstr "方式(_M)"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1016
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/prefs.c:1004
+#: src/prefs.c:1018
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs.c:1011
+#: src/prefs.c:1025
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs.c:1020
+#: src/prefs.c:1034
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5461,67 +5811,67 @@
 "声音命令(_O)\n"
 "(%s 代表文件名)"
 
-#: src/prefs.c:1058
+#: src/prefs.c:1073
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/prefs.c:1059
+#: src/prefs.c:1074
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/prefs.c:1061
+#: src/prefs.c:1076
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1079
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/prefs.c:1066
+#: src/prefs.c:1081
 msgid "_Don't send auto-response"
 msgstr "不发送自动回复(_D)"
 
-#: src/prefs.c:1067
+#: src/prefs.c:1082
 msgid "_Only send auto-response when idle"
-msgstr "仅在打瞌睡时发送自动响应(_O)"
-
-#: src/prefs.c:1068
+msgstr "仅在打瞌睡时发送自动回复(_O)"
+
+#: src/prefs.c:1083
 msgid "Do_n't send auto-response in active conversations"
 msgstr "不在当前对话中发送自动回复(_N)"
 
-#: src/prefs.c:1074
+#: src/prefs.c:1089
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/prefs.c:1076
+#: src/prefs.c:1091
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/prefs.c:1079
+#: src/prefs.c:1094
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/prefs.c:1081
+#: src/prefs.c:1096
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/prefs.c:1088
+#: src/prefs.c:1103
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/prefs.c:1089
+#: src/prefs.c:1104
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/prefs.c:1090
+#: src/prefs.c:1105
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/prefs.c:1096
+#: src/prefs.c:1111
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/prefs.c:1140
+#: src/prefs.c:1166
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5536,7 +5886,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/prefs.c:1145
+#: src/prefs.c:1171
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5548,171 +5898,144 @@
 "<span size=\"larger\">%s %s</span>\n"
 "\n"
 "<span weight=\"bold\">编写者:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/prefs.c:1276
+#: src/prefs.c:1345
 msgid "Load"
 msgstr "装入"
 
-#: src/prefs.c:1283
+#: src/prefs.c:1352
 msgid "Name"
 msgstr "名称"
 
-#: src/prefs.c:1330
+#: src/prefs.c:1399
 msgid "Details"
 msgstr "细节"
 
-#: src/prefs.c:1428
+#: src/prefs.c:1498
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/prefs.c:1519
+#: src/prefs.c:1591
 msgid "Play"
 msgstr "播放"
 
-#: src/prefs.c:1526
+#: src/prefs.c:1598
 msgid "Event"
 msgstr "事件"
 
-#: src/prefs.c:1542
-msgid "Test"
-msgstr "测试"
-
-#: src/prefs.c:1550
+#: src/prefs.c:1622
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/prefs.c:1672
+#: src/prefs.c:1746
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1782
 msgid "Interface"
 msgstr "界面"
 
-#: src/prefs.c:1711
+#: src/prefs.c:1783
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/prefs.c:1712
+#: src/prefs.c:1784
 msgid "Fonts"
 msgstr "字体"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1785
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/prefs.c:1714
+#: src/prefs.c:1786
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/prefs.c:1717
+#: src/prefs.c:1789
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/prefs.c:1718
-msgid "Chats"
-msgstr "聊天"
-
-#: src/prefs.c:1719
+#: src/prefs.c:1791
 msgid "Tabs"
 msgstr "标签"
 
-#: src/prefs.c:1720
+#: src/prefs.c:1792
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1723
+#: src/prefs.c:1795
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/prefs.c:1725
+#: src/prefs.c:1797
 msgid "Logging"
 msgstr "日志"
 
-#: src/prefs.c:1726
+#: src/prefs.c:1798
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:1727
+#: src/prefs.c:1799
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/prefs.c:1728
+#: src/prefs.c:1800
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/prefs.c:1729
+#: src/prefs.c:1801
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/prefs.c:1731
+#: src/prefs.c:1804
 msgid "Plugins"
 msgstr "插件"
 
-#: src/prefs.c:1890
-msgid "Debug Window"
-msgstr "调试窗口"
-
-#: src/prpl.c:100
-msgid "ICQ Protocol detected."
-msgstr "检测到了 ICQ 协议。"
-
-#: src/prpl.c:101
-msgid ""
-"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
-"it was probably not compiled from the same version of the source as this "
-"application was, and cannot be guaranteed to work.  It is recommended that "
-"you use the AIM/ICQ protocol to connect to ICQ"
-msgstr ""
-"Gaim 已经装入了 ICQ 插件。此插件不推荐使用。"
-"编译该插件时所用的应用程序源程序版本可能与您正在使用的版本不同,"
-"所以可能无法正常工作。推荐您使用 AIM/ICQ 协议连接到 ICQ"
-
-#: src/prpl.c:293
+#: src/prpl.c:219
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
-#: src/prpl.c:367
+#: src/prpl.c:302
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/prpl.c:507
+#: src/prpl.c:452
 #, c-format
 msgid "%s has mail from %s: %s"
 msgstr "%s 收到了 %s 发出的邮件:%s"
 
-#: src/prpl.c:507
+#: src/prpl.c:452
 msgid "No Subject"
 msgstr "无主题"
 
-#: src/prpl.c:509
+#: src/prpl.c:454
 #, c-format
 msgid "%s has new mail."
 msgstr "%s 有新邮件。"
 
-#: src/prpl.c:512
+#: src/prpl.c:457
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/prpl.c:528
+#: src/prpl.c:473
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新邮件"
 
-#: src/prpl.c:546
+#: src/prpl.c:492
 msgid "Open Mail"
 msgstr "打开邮件"
 
-#: src/prpl.c:741
+#: src/prpl.c:694
 #, 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/prpl.c:749
+#: src/prpl.c:702
 msgid ""
 "\n"
 "\n"
@@ -5722,29 +6045,29 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/prpl.c:751
+#: src/prpl.c:704
 msgid "Gaim - Information"
 msgstr "Gaim - 信息"
 
-#: src/prpl.c:753
+#: src/prpl.c:706
 msgid "Gaim - Confirm"
 msgstr "Gaim - 确认"
 
-#: src/prpl.c:792
+#: src/prpl.c:747
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
-msgstr "您目前没有可以注册新帐户的协议。"
-
-#: src/prpl.c:829
+msgstr "您目前没有可以注册新账户的协议。"
+
+#: src/prpl.c:784
 msgid "Gaim - Registration"
 msgstr "Gaim - 注册"
 
-#: src/prpl.c:841
+#: src/prpl.c:797
 msgid "Registration Information"
 msgstr "注册信息"
 
-#: src/prpl.c:854
+#: src/prpl.c:811
 msgid "Register"
 msgstr "注册"
 
@@ -5752,26 +6075,26 @@
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:709
+#: src/server.c:880
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 条消息)"
 
-#: src/server.c:721
+#: src/server.c:892
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:898 src/server.c:905
+#: src/server.c:1072 src/server.c:1079
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:921 src/server.c:928
+#: src/server.c:1095 src/server.c:1102
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:961
+#: src/server.c:1136
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -5780,11 +6103,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:964
+#: src/server.c:1139
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1055
+#: src/server.c:1227
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -5793,16 +6116,16 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1059
+#: src/server.c:1231
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1065
+#: src/server.c:1237
 msgid "Buddy Chat Invite"
 msgstr "好友聊天邀请"
 
-#: src/server.c:1261
+#: src/server.c:1433
 msgid "More Info"
 msgstr "更多信息"
 
@@ -5846,18 +6169,18 @@
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/sound.c:180
-#, c-format
-msgid "Unable to play sound because the chosen filename (%s) does not exist."
-msgstr "无法播放声音,原因是所选的文件名(%s)不存在。"
-
-#: src/sound.c:192
+#: src/sound.c:183
+#, c-format
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
+
+#: src/sound.c:195
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/sound.c:199
+#: src/sound.c:202
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5879,19 +6202,57 @@
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:1007
+#. full help text
+#: src/util.c:717
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"用法:%s [选项]...\n"
+"\n"
+"  -a, --acct          显示账户编辑窗口\n"
+"  -w, --away[=消息]   登入后设为离开(“消息”指定要使用的离开消息名称)\n"
+"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
+"  -n, --loginwin      不自动登入;显示登录窗口\n"
+"  -u, --user=名称     使用指定账户\n"
+"  -f, --file=文件     使用指定文件的配置\n"
+"  -d, --debug         将调试信息打印到标准输出\n"
+"  -v, --version       显示当前版本并退出\n"
+"  -h, --help          显示帮助并退出\n"
+
+#. short message
+#: src/util.c:732
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
+
+#: src/util.c:1020
 msgid "Not connected to AIM"
 msgstr "未连接到 AIM"
 
-#: src/util.c:1016 src/util.c:1055
+#: src/util.c:1029 src/util.c:1068
 msgid "No screenname given."
-msgstr "没有给出屏幕名。"
-
-#: src/util.c:1091
+msgstr "没有给出用户名。"
+
+#: src/util.c:1105
 msgid "No roomname given."
 msgstr "没有给出聊天室名。"
 
-#: src/util.c:1107
+#: src/util.c:1124
 msgid "Invalid AIM URI"
 msgstr "无效的 AIM URI"
 
@@ -5926,3 +6287,20 @@
 msgid "Exit"
 msgstr "退出"
 
+#: src/plugin.c:227
+#, c-format
+msgid "The plugin %s did not return any valid plugin information"
+msgstr "插件 %s 未返回任何有效的插件信息"
+
+#: src/plugin.c:231
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim 无法装入您的插件。"
+
+#. * Custom away message.
+#: src/prpl.h:165
+msgid "Custom"
+msgstr "自定义"
+
+#: src/gtkdebug.c:71
+msgid "Debug Window"
+msgstr "调试窗口"