changeset 6043:d8d103eaa457

[gaim-migrate @ 6493] Wang (fundawang) updated the zh_CN po committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 06 Jul 2003 19:06:42 +0000
parents 460b4ba2d452
children 8642749e55ca
files po/zh_CN.po
diffstat 1 files changed, 2036 insertions(+), 1926 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Sun Jul 06 08:11:00 2003 +0000
+++ b/po/zh_CN.po	Sun Jul 06 19:06:42 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-06-08 11:12+0800\n"
-"PO-Revision-Date: 2003-06-07 21:54+0800\n"
+"POT-Creation-Date: 2003-07-05 12:18+0800\n"
+"PO-Revision-Date: 2003-07-04 14:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,67 +15,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:93 src/win32/systray.c:359 src/gtkaccount.c:331
-#: src/gtkaccount.c:1465
+#: plugins/docklet/docklet.c:105 src/gtkaccount.c:468 src/gtkaccount.c:1623
+#: src/win32/systray.c:365
 msgid "Auto-login"
 msgstr "自动登录"
 
-#: plugins/docklet/docklet.c:97
+#: plugins/docklet/docklet.c:108
 msgid "New Message.."
 msgstr "新消息..."
 
-#: plugins/docklet/docklet.c:98
+#: plugins/docklet/docklet.c:109
 msgid "Join A Chat..."
 msgstr "加入聊天..."
 
-#: plugins/docklet/docklet.c:129
+#: plugins/docklet/docklet.c:140
 msgid "New..."
 msgstr "新建..."
 
-#: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:72
-#: src/protocols/irc/irc.c:1030 src/protocols/jabber/jabber.c:1184
-#: src/protocols/jabber/jabber.c:3446 src/protocols/jabber/jabber.c:3500
-#: src/protocols/oscar/oscar.c:2810 src/protocols/oscar/oscar.c:4498
-#: src/protocols/oscar/oscar.c:5385 src/protocols/oscar/oscar.c:5715
-#: src/gtkblist.c:1544 src/gtkpounce.c:565 src/gtkprefs.c:1483
+#: plugins/docklet/docklet.c:144 src/protocols/gg/gg.c:54
+#: src/protocols/irc/irc.c:1019 src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3487
+#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:5436 src/protocols/oscar/oscar.c:5831
+#: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1493
 msgid "Away"
 msgstr "离开"
 
-#: plugins/docklet/docklet.c:139 src/away.c:534
+#: plugins/docklet/docklet.c:150 src/away.c:535
 msgid "Back"
 msgstr "回来"
 
-#: plugins/docklet/docklet.c:147
+#: plugins/docklet/docklet.c:158
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: plugins/docklet/docklet.c:152 src/gtkft.c:575
+#: plugins/docklet/docklet.c:163 src/gtkft.c:557
 msgid "File Transfers"
 msgstr "文件传送"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:153 src/main.c:377 src/gtkaccount.c:1620
+#: plugins/docklet/docklet.c:164 src/gtkaccount.c:1774 src/main.c:418
 msgid "Accounts"
 msgstr "账户"
 
-#: plugins/docklet/docklet.c:154 src/gtkprefs.c:2323 src/main.c:387
-#: src/win32/systray.c:355
+#: plugins/docklet/docklet.c:165 src/gtkprefs.c:2338 src/main.c:428
+#: src/win32/systray.c:361
 msgid "Preferences"
 msgstr "首选项"
 
-#: plugins/docklet/docklet.c:163 src/win32/systray.c:159
+#: plugins/docklet/docklet.c:174 src/win32/systray.c:165
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:167
+#: plugins/docklet/docklet.c:178
 msgid "Quit"
 msgstr "退出"
 
-#: plugins/docklet/docklet.c:464
+#: plugins/docklet/docklet.c:477
 msgid "Tray Icon Configuration"
 msgstr "托盘图标配置"
 
-#: plugins/docklet/docklet.c:468
+#: plugins/docklet/docklet.c:481
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "直到点击托盘图标才显示新消息(_H)"
 
@@ -86,19 +86,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:492
+#: plugins/docklet/docklet.c:505
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:495
+#: plugins/docklet/docklet.c:508
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系统托盘中显示 Gaim 的图标。"
 
 #. *  description
-#: plugins/docklet/docklet.c:497
+#: plugins/docklet/docklet.c:510
 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 "
@@ -116,14 +116,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:83
+#: plugins/autorecon.c:80
 msgid "Auto-Reconnect"
 msgstr "自动重连"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:86 plugins/autorecon.c:88
+#: plugins/autorecon.c:83 plugins/autorecon.c:85
 msgid "When you are kicked offline, this reconnects you."
 msgstr "如果您被踢出来了,程序将会自动重新连接。"
 
@@ -240,15 +240,15 @@
 msgid "Change"
 msgstr "变化"
 
-#: plugins/history.c:86
+#: plugins/history.c:87
 msgid "History"
 msgstr "历史"
 
-#: plugins/history.c:88
+#: plugins/history.c:89
 msgid "Shows recently logged conversations in new conversations."
 msgstr "在新对话中显示显示最近记录的对话。"
 
-#: plugins/history.c:89
+#: plugins/history.c:90
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
@@ -261,42 +261,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:75
+#: plugins/iconaway.c:74
 msgid "Iconify on Away"
 msgstr "离开后变为图标"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/iconaway.c:78 plugins/iconaway.c:80
+#: plugins/iconaway.c:77 plugins/iconaway.c:79
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "您离开后将好友列表和对话都变为图标。"
 
-#: plugins/idle.c:86 src/protocols/irc/irc.c:945
+#: plugins/idle.c:70 src/protocols/irc/irc.c:934
 msgid "Idle Time"
 msgstr "瞌睡时间"
 
-#: plugins/idle.c:94
+#: plugins/idle.c:78
 msgid "Set"
 msgstr "设置"
 
-#: plugins/idle.c:99
+#: plugins/idle.c:83
 msgid "idle for"
 msgstr "打瞌睡"
 
-#: plugins/idle.c:106 plugins/timestamp.c:86
+#: plugins/idle.c:90 plugins/timestamp.c:88
 msgid "minutes."
 msgstr "分钟。"
 
-#: plugins/idle.c:112
+#: plugins/idle.c:96
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: plugins/idle.c:135
+#: plugins/idle.c:119
 msgid "I'dle Mak'er"
 msgstr "瞌睡虫"
 
-#: plugins/idle.c:137 plugins/idle.c:138
+#: plugins/idle.c:121 plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允许您手动配置您睡了多长时间"
 
@@ -436,47 +436,47 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
-#: plugins/spellchk.c:411
+#: plugins/spellchk.c:403
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: plugins/spellchk.c:435
+#: plugins/spellchk.c:427
 msgid "You type"
 msgstr "输入文字"
 
-#: plugins/spellchk.c:447
+#: plugins/spellchk.c:439
 msgid "You send"
 msgstr "送出文字"
 
-#: plugins/spellchk.c:473
+#: plugins/spellchk.c:465
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: plugins/spellchk.c:480
+#: plugins/spellchk.c:472
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: plugins/spellchk.c:494
+#: plugins/spellchk.c:486
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
-#: plugins/spellchk.c:534
+#: plugins/spellchk.c:526
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: plugins/spellchk.c:536 plugins/spellchk.c:537
+#: plugins/spellchk.c:528 plugins/spellchk.c:529
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
-#: plugins/timestamp.c:72
+#: plugins/timestamp.c:74
 msgid "iChat Timestamp"
 msgstr "iChat 时间戳"
 
-#: plugins/timestamp.c:79
+#: plugins/timestamp.c:81
 msgid "Delay"
 msgstr "延迟"
 
-#: plugins/timestamp.c:92
+#: plugins/timestamp.c:94
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -487,32 +487,73 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:145
+#: plugins/timestamp.c:147
 msgid "Timestamp"
 msgstr "时间戳"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:148 plugins/timestamp.c:150
+#: plugins/timestamp.c:150 plugins/timestamp.c:152
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
 
+#: plugins/gaim-remote/remote.c:85
+msgid "Not connected to AIM"
+msgstr "未连接到 AIM"
+
+#: plugins/gaim-remote/remote.c:94 plugins/gaim-remote/remote.c:133
+msgid "No screenname given."
+msgstr "没有给出用户名。"
+
+#: plugins/gaim-remote/remote.c:170
+msgid "No roomname given."
+msgstr "没有给出聊天室名。"
+
+#: plugins/gaim-remote/remote.c:189
+msgid "Invalid AIM URI"
+msgstr "无效的 AIM URI"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:733
+msgid "Remote Control"
+msgstr "远程控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:736
+msgid "Provides remote control for gaim applications."
+msgstr "提供 gaim 程序的远程控制。"
+
+#. *  description
+#: plugins/gaim-remote/remote.c:738
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr "为 Gaim 添加可通过第三方应用程序或 gaim-remote 工具远程控制的能力。"
+
 #. Configuration frame
-#: plugins/gestures/gestures.c:219
+#: plugins/gestures/gestures.c:222
 msgid "Mouse Gestures Configuration"
 msgstr "鼠标手势配置"
 
-#: plugins/gestures/gestures.c:226
+#: plugins/gestures/gestures.c:229
 msgid "Middle mouse button"
 msgstr "鼠标中键"
 
-#: plugins/gestures/gestures.c:231
+#: plugins/gestures/gestures.c:234
 msgid "Right mouse button"
 msgstr "鼠标右键"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:243
+#: plugins/gestures/gestures.c:246
 msgid "_Visual gesture display"
 msgstr "可视手势显示(_V)"
 
@@ -523,19 +564,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:270
+#: plugins/gestures/gestures.c:273
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:273
+#: plugins/gestures/gestures.c:276
 msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#: plugins/gestures/gestures.c:275
+#: plugins/gestures/gestures.c:278
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -558,7 +599,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:71 plugins/ticker/ticker.c:280
+#: plugins/ticker/ticker.c:68 plugins/ticker/ticker.c:280
 msgid "Buddy Ticker"
 msgstr "好友点点通"
 
@@ -569,35 +610,35 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: plugins/win32/transparency/win2ktrans.c:132
-#: plugins/win32/transparency/win2ktrans.c:424
-#: plugins/win32/transparency/win2ktrans.c:458
+#: plugins/win32/transparency/win2ktrans.c:133
+#: plugins/win32/transparency/win2ktrans.c:359
+#: plugins/win32/transparency/win2ktrans.c:393
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:405
+#: plugins/win32/transparency/win2ktrans.c:340
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:406
+#: plugins/win32/transparency/win2ktrans.c:341
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:416
+#: plugins/win32/transparency/win2ktrans.c:351
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:441 src/gtkprefs.c:909
+#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:847
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: plugins/win32/transparency/win2ktrans.c:442
+#: plugins/win32/transparency/win2ktrans.c:377
 msgid "_Keep Buddy List window on top"
-msgstr "好友列表窗口常局顶端(_K)"
-
-#: plugins/win32/transparency/win2ktrans.c:445
+msgstr "好友列表窗口常居顶端(_K)"
+
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
@@ -608,15 +649,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:501
+#: plugins/win32/transparency/win2ktrans.c:436
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:504
-#: plugins/win32/transparency/win2ktrans.c:506
+#: plugins/win32/transparency/win2ktrans.c:439
+#: plugins/win32/transparency/win2ktrans.c:441
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows.\n"
 "\n"
@@ -627,23 +668,23 @@
 "* 注意:此插件需要 Win2000 或 WinXP。"
 
 #. IM Convo trans options
-#: plugins/win32/winprefs/winprefs.c:120
+#: plugins/win32/winprefs/winprefs.c:124
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/win32/winprefs/winprefs.c:121
+#: plugins/win32/winprefs/winprefs.c:125
 msgid "_Start Gaim on Windows startup"
 msgstr "Windows 启动时启动 Gaim(_S)"
 
-#: plugins/win32/winprefs/winprefs.c:148
+#: plugins/win32/winprefs/winprefs.c:152
 msgid "WinGaim Options"
 msgstr "WinGaim 选项"
 
-#: plugins/win32/winprefs/winprefs.c:150 plugins/win32/winprefs/winprefs.c:151
+#: plugins/win32/winprefs/winprefs.c:154 plugins/win32/winprefs/winprefs.c:155
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: plugins/perl/perl.c:396
+#: plugins/perl/perl.c:405
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 调用参数不对。请参考 PERL-HOWTO。"
 
@@ -654,13 +695,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1382
+#: plugins/perl/perl.c:1391
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1384 plugins/perl/perl.c:1385
+#: plugins/perl/perl.c:1393 plugins/perl/perl.c:1394
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -671,223 +712,224 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:68
+#: plugins/statenotify.c:72
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/statenotify.c:71 plugins/statenotify.c:74
+#: plugins/statenotify.c:75 plugins/statenotify.c:78
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: src/protocols/gg/gg.c:70 src/protocols/jabber/jabber.c:1192
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1180
 #: src/protocols/msn/msn.c:311 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1264
-#: src/protocols/yahoo/yahoo.c:1343
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1251
+#: src/protocols/yahoo/yahoo.c:1330
 msgid "Available"
 msgstr "可用"
 
-#: src/protocols/gg/gg.c:71
+#: src/protocols/gg/gg.c:53
 msgid "Available for friends only"
 msgstr "只对好友可用"
 
-#: src/protocols/gg/gg.c:73
+#: src/protocols/gg/gg.c:55
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:74 src/protocols/jabber/jabber.c:3449
-#: src/protocols/jabber/jabber.c:3512 src/protocols/oscar/oscar.c:2814
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:4513
-#: src/protocols/oscar/oscar.c:5720 src/protocols/yahoo/yahoo.c:1079
-#: src/protocols/yahoo/yahoo.c:1286 src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2825
+#: src/protocols/oscar/oscar.c:4525 src/protocols/oscar/oscar.c:4552
+#: src/protocols/oscar/oscar.c:5836 src/protocols/yahoo/yahoo.c:1066
+#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1340
 msgid "Invisible"
 msgstr "隐身"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:57
 msgid "Invisible for friends only"
 msgstr "只对好友隐身"
 
-#: src/protocols/gg/gg.c:76
+#: src/protocols/gg/gg.c:58
 msgid "Unavailable"
 msgstr "不可用"
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:139
 msgid "Unable to resolve hostname."
 msgstr "无法解析主机名。"
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:142
 msgid "Unable to connect to server."
 msgstr "无法连接到服务器。"
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:145
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:148
 msgid "Error while reading from socket."
 msgstr "从套接字读取时出错。"
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:151
 msgid "Error while writing to socket."
 msgstr "向套接字写入时出错。"
 
-#: src/protocols/gg/gg.c:172
+#: src/protocols/gg/gg.c:154
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: src/protocols/gg/gg.c:175
+#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "未知的错误代码。"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:262
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: src/protocols/gg/gg.c:301
+#: src/protocols/gg/gg.c:283
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: src/protocols/gg/gg.c:307
+#: src/protocols/gg/gg.c:290
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
-#: src/protocols/gg/gg.c:415
+#: src/protocols/gg/gg.c:402
 msgid "Unable to connect."
 msgstr "无法连接。"
 
-#: src/protocols/gg/gg.c:430
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "正在读取数据"
 
-#: src/protocols/gg/gg.c:433
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "平衡器握手"
 
-#: src/protocols/gg/gg.c:436
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "正在读取服务器密钥"
 
-#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "正在交换密钥"
 
-#: src/protocols/gg/gg.c:448
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "GG 库的关键错误\n"
 
-#: src/protocols/gg/gg.c:466 src/protocols/gg/gg.c:556
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #, c-format
 msgid "Connect to %s failed"
 msgstr "连接到 %s 失败"
 
-#: src/protocols/gg/gg.c:513
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "无法连通服务器"
 
-#: src/protocols/gg/gg.c:525
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "发送为消息"
 
-#: src/protocols/gg/gg.c:530
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "正在查阅 GG 服务器"
 
-#: src/protocols/gg/gg.c:533
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:580
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:643
+#: src/protocols/gg/gg.c:633
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:648
+#: src/protocols/gg/gg.c:638
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:673
+#: src/protocols/gg/gg.c:663
 msgid "Active"
 msgstr "活跃"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/protocols/gg/gg.c:674 src/gtkrequest.c:96 src/request.h:218
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:166 src/request.h:802
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:674 src/gtkrequest.c:97 src/request.h:218
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:167 src/request.h:802
 msgid "No"
 msgstr "否"
 
-#: src/protocols/gg/gg.c:678
+#: src/protocols/gg/gg.c:668
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:682
+#: src/protocols/gg/gg.c:672
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:691 src/protocols/gg/gg.c:1380
+#: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:698 src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:688 src/protocols/gg/gg.c:691
 msgid "Birth year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:707 src/protocols/gg/gg.c:709
-#: src/protocols/gg/gg.c:711
+#: src/protocols/gg/gg.c:697 src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:701
 msgid "Sex"
 msgstr "性别"
 
-#. Line 5
-#: src/protocols/gg/gg.c:715 src/dialogs.c:2066 src/dialogs.c:2710
+#. City
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:2016 src/dialogs.c:2665
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:748
+#: src/protocols/gg/gg.c:738
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:756
+#: src/protocols/gg/gg.c:746
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:817
+#: src/protocols/gg/gg.c:809
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:817
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:825
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:833
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:841
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:848
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
@@ -951,9 +993,9 @@
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4328
-#: src/protocols/oscar/oscar.c:5915 src/protocols/toc/toc.c:1450
-#: src/dialogs.c:2177 src/dialogs.c:2186
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4315
+#: src/protocols/oscar/oscar.c:6096 src/protocols/toc/toc.c:1442
+#: src/dialogs.c:2127 src/dialogs.c:2136
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -998,27 +1040,28 @@
 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:2658
-#: src/dialogs.c:2478 src/gtkconv.c:824 src/gtkconv.c:2653 src/gtkconv.c:3799
-#: src/prpl.c:415 src/gtkrequest.c:103
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2669
+#: src/dialogs.c:2433 src/gtkconv.c:1096 src/gtkconv.c:2938 src/gtkconv.c:4095
+#: src/gtkrequest.c:173 src/prpl.c:312
 msgid "Add"
 msgstr "添加"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1113
-#: src/protocols/irc/irc.c:1442 src/protocols/msn/msn.c:171
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1431 src/protocols/msn/msn.c:171
 #: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
 #: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
-#: src/protocols/oscar/oscar.c:2390 src/protocols/oscar/oscar.c:2427
-#: src/protocols/oscar/oscar.c:2462 src/protocols/oscar/oscar.c:2507
-#: src/protocols/oscar/oscar.c:5593 src/protocols/oscar/oscar.c:5798
-#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1196
-#: src/buddy_chat.c:314 src/dialogs.c:471 src/dialogs.c:482 src/dialogs.c:494
-#: src/dialogs.c:2123 src/dialogs.c:2238 src/dialogs.c:2299 src/dialogs.c:2467
-#: src/dialogs.c:2652 src/dialogs.c:2801 src/dialogs.c:3470 src/dialogs.c:3962
-#: src/dialogs.c:4443 src/dialogs.c:5016 src/multi.c:177 src/prpl.c:416
-#: src/gtkaccount.c:1356 src/gtkrequest.c:99 src/request.h:227
-#: src/request.h:237 src/gtkconn.c:128
+#: src/protocols/oscar/oscar.c:2401 src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2473 src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:5709 src/protocols/oscar/oscar.c:5924
+#: src/protocols/oscar/oscar.c:5972 src/protocols/oscar/oscar.c:6032
+#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1183
+#: src/buddy_chat.c:375 src/dialogs.c:453 src/dialogs.c:464 src/dialogs.c:476
+#: src/dialogs.c:2073 src/dialogs.c:2188 src/dialogs.c:2254 src/dialogs.c:2422
+#: src/dialogs.c:2607 src/dialogs.c:2756 src/dialogs.c:3427 src/dialogs.c:3920
+#: src/dialogs.c:4401 src/dialogs.c:4954 src/gtkaccount.c:1512
+#: src/gtkconn.c:143 src/gtkrequest.c:169 src/multi.c:177 src/prpl.c:313
+#: src/request.h:811 src/request.h:821
 msgid "Cancel"
 msgstr "取消"
 
@@ -1027,16 +1070,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:1724
-#: src/protocols/msn/notification.c:461 src/protocols/msn/notification.c:723
-#: src/protocols/oscar/oscar.c:2586 src/protocols/oscar/oscar.c:5041
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1712
+#: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
+#: src/protocols/oscar/oscar.c:2597 src/protocols/oscar/oscar.c:5086
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1725
-#: src/protocols/msn/notification.c:462 src/protocols/msn/notification.c:725
-#: src/protocols/oscar/oscar.c:2588 src/protocols/oscar/oscar.c:5042
-#: src/dialogs.c:2466
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1713
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5087
+#: src/dialogs.c:2421
 msgid "Deny"
 msgstr "拒绝"
 
@@ -1044,11 +1087,11 @@
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2344
-#: src/protocols/jabber/jabber.c:2378 src/protocols/jabber/jabber.c:4247
-#: src/protocols/jabber/jabber.c:4293 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1336
-#: src/protocols/napster/napster.c:511
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2331
+#: src/protocols/jabber/jabber.c:2365 src/protocols/jabber/jabber.c:4234
+#: src/protocols/jabber/jabber.c:4280 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1376
+#: src/protocols/napster/napster.c:496
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -1056,7 +1099,7 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3893
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3932
 msgid "Nick:"
 msgstr "昵称:"
 
@@ -1064,203 +1107,204 @@
 msgid "Gaim User"
 msgstr "Gaim 用户"
 
-#: src/protocols/irc/irc.c:196
+#: src/protocols/irc/irc.c:185
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/irc.c:497 src/protocols/irc/irc.c:2615
+#: src/protocols/irc/irc.c:486 src/protocols/irc/irc.c:2605
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/irc.c:2624
+#: src/protocols/irc/irc.c:539 src/protocols/irc/irc.c:2614
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:674
 msgid "No topic is set"
 msgstr "没有设置话题"
 
-#: src/protocols/irc/irc.c:706 src/protocols/irc/irc.c:1763
+#: src/protocols/irc/irc.c:695 src/protocols/irc/irc.c:1752
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 已经将话题改为:%s</B>"
 
-#: src/protocols/irc/irc.c:751
+#: src/protocols/irc/irc.c:740
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 模式/%s [%c%c %s] 由 %s"
 
-#: src/protocols/irc/irc.c:928 src/protocols/irc/irc.c:941
+#: src/protocols/irc/irc.c:917 src/protocols/irc/irc.c:930
 msgid "User"
 msgstr "用户名"
 
 #. Splits
-#: src/protocols/irc/irc.c:932 src/protocols/irc/irc.c:3038
-#: src/protocols/jabber/jabber.c:4424 src/protocols/napster/napster.c:654
+#: src/protocols/irc/irc.c:921 src/protocols/irc/irc.c:3028
+#: src/protocols/jabber/jabber.c:4411 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "服务器"
 
-#: src/protocols/irc/irc.c:936 src/protocols/irc/irc.c:1091
-#: src/protocols/irc/irc.c:1655
+#: src/protocols/irc/irc.c:925 src/protocols/irc/irc.c:1080
+#: src/protocols/irc/irc.c:1644
 msgid "IRC Operator"
 msgstr "IRC 管理者"
 
-#: src/protocols/irc/irc.c:949
+#: src/protocols/irc/irc.c:938
 msgid "Channels"
 msgstr "频道"
 
-#: src/protocols/irc/irc.c:955
+#: src/protocols/irc/irc.c:944
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s 是标识的用户"
 
-#: src/protocols/irc/irc.c:970
+#: src/protocols/irc/irc.c:959
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr "%ld 秒 [登入:%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1091
+#: src/protocols/irc/irc.c:1080
 msgid "Rehashing server"
 msgstr "正在重连服务器"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1083
 msgid "No such nick/channel"
 msgstr "没有这样的昵称/频道"
 
-#: src/protocols/irc/irc.c:1094 src/protocols/irc/irc.c:1097
-#: src/protocols/irc/irc.c:1102 src/protocols/irc/irc.c:1106
-#: src/protocols/irc/irc.c:1471 src/protocols/irc/irc.c:1613
+#: src/protocols/irc/irc.c:1083 src/protocols/irc/irc.c:1086
+#: src/protocols/irc/irc.c:1091 src/protocols/irc/irc.c:1095
+#: src/protocols/irc/irc.c:1460 src/protocols/irc/irc.c:1602
 msgid "IRC Error"
 msgstr "IRC 出错"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1097
+#: src/protocols/irc/irc.c:1086
 msgid "No such server"
 msgstr "没有该服务器"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1091
 msgid "No nickname given"
 msgstr "没有给出昵称"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1105
+#: src/protocols/irc/irc.c:1094
 msgid "You're not an IRC operator!"
 msgstr "您不是 IRC 管理员!"
 
-#: src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1098
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "该昵称已经被其他人使用了。请输入新昵称"
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1112 src/protocols/msn/msn.c:170
+#: src/protocols/irc/irc.c:1101 src/protocols/msn/msn.c:170
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2426
-#: src/protocols/oscar/oscar.c:2506 src/protocols/oscar/oscar.c:5797
-#: src/protocols/oscar/oscar.c:5845 src/protocols/yahoo/yahoo.c:1195
-#: src/dialogs.c:2234 src/dialogs.c:2367 src/dialogs.c:2651 src/dialogs.c:2797
-#: src/dialogs.c:3955 src/dialogs.c:4437 src/gtkrequest.c:98 src/request.h:227
+#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2437
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:5923
+#: src/protocols/oscar/oscar.c:5971 src/protocols/oscar/oscar.c:6031
+#: src/protocols/yahoo/yahoo.c:1182 src/dialogs.c:2184 src/dialogs.c:2322
+#: src/dialogs.c:2606 src/dialogs.c:2752 src/dialogs.c:3913 src/dialogs.c:4395
+#: src/gtkrequest.c:168 src/request.h:811
 msgid "OK"
 msgstr "确定"
 
-#: src/protocols/irc/irc.c:1398 src/protocols/irc/irc.c:1404
-#: src/protocols/irc/irc.c:1410 src/protocols/irc/irc.c:1424
+#: src/protocols/irc/irc.c:1387 src/protocols/irc/irc.c:1393
+#: src/protocols/irc/irc.c:1399 src/protocols/irc/irc.c:1413
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 信息"
 
-#: src/protocols/irc/irc.c:1434
+#: src/protocols/irc/irc.c:1423
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 想要建立二人世界"
 
-#: src/protocols/irc/irc.c:1437
+#: src/protocols/irc/irc.c:1426
 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:1441 src/protocols/oscar/oscar.c:2389
-#: src/protocols/oscar/oscar.c:5592
+#: src/protocols/irc/irc.c:1430 src/protocols/oscar/oscar.c:2400
+#: src/protocols/oscar/oscar.c:5708
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/irc/irc.c:1468
+#: src/protocols/irc/irc.c:1457
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "收到了 %s 发出的无效文件发送请求。"
 
-#: src/protocols/irc/irc.c:1549 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:736
+#: src/protocols/irc/irc.c:1538 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/irc/irc.c:1611
+#: src/protocols/irc/irc.c:1600
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您已经被踢出了 %s: %s"
 
-#: src/protocols/irc/irc.c:1616
+#: src/protocols/irc/irc.c:1605
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1672 src/protocols/irc/irc.c:2925
+#: src/protocols/irc/irc.c:1661 src/protocols/irc/irc.c:2915
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客户信息"
 
-#: src/protocols/irc/irc.c:1678 src/protocols/irc/irc.c:2931
+#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2921
 msgid "CTCP UserInfo"
 msgstr "CTCP 用户信息"
 
-#: src/protocols/irc/irc.c:1684 src/protocols/irc/irc.c:2937
+#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2927
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1712 src/protocols/irc/irc.c:2943
+#: src/protocols/irc/irc.c:1701 src/protocols/irc/irc.c:2933
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1957 src/protocols/oscar/oscar.c:678
-#: src/protocols/toc/toc.c:250
+#: src/protocols/irc/irc.c:1946 src/protocols/oscar/oscar.c:674
+#: src/protocols/toc/toc.c:233
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:1971 src/protocols/trepia/trepia.c:847
+#: src/protocols/irc/irc.c:1960 src/protocols/trepia/trepia.c:1148
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: src/protocols/irc/irc.c:2212
+#: src/protocols/irc/irc.c:2201
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的话题是 %s"
 
-#: src/protocols/irc/irc.c:2308
+#: src/protocols/irc/irc.c:2297
 #, c-format
 msgid "You have left %s"
 msgstr "您已经离开了 %s"
 
-#: src/protocols/irc/irc.c:2309
+#: src/protocols/irc/irc.c:2298
 msgid "IRC Part"
 msgstr "IRC 部分"
 
-#: src/protocols/irc/irc.c:2364
+#: src/protocols/irc/irc.c:2353
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>正在请求二人世界</I>"
 
-#: src/protocols/irc/irc.c:2381
+#: src/protocols/irc/irc.c:2370
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2386
+#: src/protocols/irc/irc.c:2375
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1268,11 +1312,11 @@
 "<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
 "><BR>PING <昵称></B><BR>"
 
-#: src/protocols/irc/irc.c:2394
+#: src/protocols/irc/irc.c:2383
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
 
-#: src/protocols/irc/irc.c:2399
+#: src/protocols/irc/irc.c:2388
 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 "
@@ -1284,19 +1328,19 @@
 "入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
 "HELP DCC 可查看二人世界的命令"
 
-#: src/protocols/irc/irc.c:2422
+#: src/protocols/irc/irc.c:2411
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知命令</B>"
 
-#: src/protocols/irc/irc.c:2482
+#: src/protocols/irc/irc.c:2471
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:2487 src/main.c:361 src/gtkaccount.c:313
+#: src/protocols/irc/irc.c:2476 src/gtkaccount.c:450 src/main.c:402
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:2912
+#: src/protocols/irc/irc.c:2902
 msgid "DCC Chat"
 msgstr "二人世界"
 
@@ -1310,313 +1354,314 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3018 src/protocols/irc/irc.c:3020
+#: src/protocols/irc/irc.c:3008 src/protocols/irc/irc.c:3010
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. Account Options
-#: src/protocols/irc/irc.c:3042 src/protocols/jabber/jabber.c:4431
-#: src/protocols/msn/msn.c:1221 src/protocols/napster/napster.c:659
-#: src/gtkprefs.c:1184 src/protocols/trepia/trepia.c:1042
+#: src/protocols/irc/irc.c:3032 src/protocols/jabber/jabber.c:4418
+#: src/protocols/msn/msn.c:1221 src/protocols/napster/napster.c:644
+#: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1144
 msgid "Port"
 msgstr "端口"
 
-#: src/protocols/irc/irc.c:3046
+#: src/protocols/irc/irc.c:3036
 msgid "Encoding"
 msgstr "编码"
 
-#: src/protocols/jabber/jabber.c:992
+#: src/protocols/jabber/jabber.c:977
 msgid "Unable to change password."
 msgstr "无法更改密码。"
 
-#: src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:978
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "您输入的旧密码不正确。您的密码未被更改。"
 
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:984
 msgid "Unable to change password"
 msgstr "无法更改密码"
 
-#: src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jabber.c:985
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
 
-#: src/protocols/jabber/jabber.c:1177 src/blist.c:735 src/gtkpounce.c:299
-#: src/gtkaccount.c:145
+#: src/protocols/jabber/jabber.c:1165 src/blist.c:745 src/gtkaccount.c:148
+#: src/gtkpounce.c:307
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3445
-#: src/protocols/jabber/jabber.c:3496
+#: src/protocols/jabber/jabber.c:1174 src/protocols/jabber/jabber.c:3432
+#: src/protocols/jabber/jabber.c:3483
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3447
-#: src/protocols/jabber/jabber.c:3504
+#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3434
+#: src/protocols/jabber/jabber.c:3491
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:1190 src/protocols/jabber/jabber.c:3448
-#: src/protocols/jabber/jabber.c:3508 src/protocols/oscar/oscar.c:2804
-#: src/protocols/oscar/oscar.c:4501 src/protocols/oscar/oscar.c:5716
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3435
+#: src/protocols/jabber/jabber.c:3495 src/protocols/oscar/oscar.c:2815
+#: src/protocols/oscar/oscar.c:4540 src/protocols/oscar/oscar.c:5832
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:1429
+#: src/protocols/jabber/jabber.c:1417
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 错误 %s"
 
-#: src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1524
 #, c-format
 msgid "Error %s: %s"
 msgstr "错误 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1527
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/jabber.c:1717
+#: src/protocols/jabber/jabber.c:1705
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/jabber.c:1745
+#: src/protocols/jabber/jabber.c:1733
 #, 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:1748
+#: src/protocols/jabber/jabber.c:1736
 msgid "No such user."
 msgstr "没有这样的用户。"
 
 #. Should never happen.
-#: src/protocols/jabber/jabber.c:1839 src/protocols/msn/notification.c:87
-#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:620
-#: src/blist.c:444 src/dialogs.c:923
+#: src/protocols/jabber/jabber.c:1827 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:454 src/dialogs.c:847
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1912
+#: src/protocols/jabber/jabber.c:1900
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:1947
+#: src/protocols/jabber/jabber.c:1934
 msgid "Unknown login error"
 msgstr "未知的登录错误"
 
-#: src/protocols/jabber/jabber.c:2297
+#: src/protocols/jabber/jabber.c:2284
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2342 src/protocols/jabber/jabber.c:4245
+#: src/protocols/jabber/jabber.c:2329 src/protocols/jabber/jabber.c:4232
 msgid "Connection lost"
 msgstr "连接已丢失"
 
-#: src/protocols/jabber/jabber.c:2349
+#: src/protocols/jabber/jabber.c:2336
 msgid "Connected"
 msgstr "已连接"
 
-#: src/protocols/jabber/jabber.c:2352
+#: src/protocols/jabber/jabber.c:2339
 msgid "Requesting Authentication Method"
 msgstr "正在请求认证方法"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2372 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:504
-#: src/protocols/yahoo/yahoo.c:994
+#: src/protocols/jabber/jabber.c:2359 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:981
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:2698
+#: src/protocols/jabber/jabber.c:2685
 #, 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:2700
+#: src/protocols/jabber/jabber.c:2687
 msgid "Unable to add buddy."
 msgstr "无法添加好友。"
 
-#: src/protocols/jabber/jabber.c:2701
+#: src/protocols/jabber/jabber.c:2688
 msgid "Jabber Error"
 msgstr "Jabber 错误"
 
-#: src/protocols/jabber/jabber.c:2960
+#: src/protocols/jabber/jabber.c:2947
 msgid "Room:"
 msgstr "房间:"
 
-#: src/protocols/jabber/jabber.c:2965
+#: src/protocols/jabber/jabber.c:2952
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/protocols/jabber/jabber.c:2971
+#: src/protocols/jabber/jabber.c:2958
 msgid "Handle:"
 msgstr "门把手:"
 
-#: src/protocols/jabber/jabber.c:3001
+#: src/protocols/jabber/jabber.c:2988
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/jabber.c:3237 src/protocols/jabber/jabber.c:3288
-#: src/protocols/jabber/jabber.c:3713
+#: src/protocols/jabber/jabber.c:3224 src/protocols/jabber/jabber.c:3275
+#: src/protocols/jabber/jabber.c:3700
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3238
+#: src/protocols/jabber/jabber.c:3225
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:3289 src/protocols/jabber/jabber.c:3348
-#: src/protocols/jabber/jabber.c:3359 src/protocols/jabber/jabber.c:3739
+#: src/protocols/jabber/jabber.c:3276 src/protocols/jabber/jabber.c:3335
+#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3726
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/jabber.c:3359 src/protocols/jabber/jabber.c:3381
-#: src/protocols/oscar/oscar.c:5389
+#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3368
+#: src/protocols/oscar/oscar.c:5444
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3394
+#: src/protocols/jabber/jabber.c:3381
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/protocols/jabber/jabber.c:3406 src/gtkconv.c:811
+#: src/protocols/jabber/jabber.c:3393 src/gtkconv.c:1083
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/protocols/jabber/jabber.c:3413
+#: src/protocols/jabber/jabber.c:3400
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/jabber.c:3416
+#: src/protocols/jabber/jabber.c:3403
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/jabber.c:3423
+#: src/protocols/jabber/jabber.c:3410
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/jabber.c:3431
+#: src/protocols/jabber/jabber.c:3418
 msgid "Re-request authorization"
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3444 src/protocols/jabber/jabber.c:3494
-#: src/protocols/oscar/oscar.c:2816 src/protocols/oscar/oscar.c:4496
-#: src/protocols/oscar/oscar.c:5714 src/protocols/yahoo/yahoo.c:1083
-#: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
-#: src/gtkaccount.c:1454
+#: src/protocols/jabber/jabber.c:3431 src/protocols/jabber/jabber.c:3481
+#: src/protocols/oscar/oscar.c:2827 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:5830 src/protocols/yahoo/yahoo.c:1070
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1612
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3621
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/jabber.c:3622
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3623
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3624
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3638 src/dialogs.c:2922
+#: src/protocols/jabber/jabber.c:3625 src/dialogs.c:2877
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3639
+#: src/protocols/jabber/jabber.c:3626
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/jabber.c:3627
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/jabber.c:3628
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/jabber.c:3629
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3630
 msgid "Postal Code"
 msgstr "邮政编码"
 
-#. Line 7
-#: src/protocols/jabber/jabber.c:3644 src/dialogs.c:2088 src/dialogs.c:2728
+#. Country
+#: src/protocols/jabber/jabber.c:3631 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:2038 src/dialogs.c:2683
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/jabber.c:3645
+#: src/protocols/jabber/jabber.c:3632
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3646 src/dialogs.c:2786
+#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2741
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/jabber.c:3647
+#: src/protocols/jabber/jabber.c:3634
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3648
+#: src/protocols/jabber/jabber.c:3635
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3649
+#: src/protocols/jabber/jabber.c:3636
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3650
+#: src/protocols/jabber/jabber.c:3637
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3651
+#: src/protocols/jabber/jabber.c:3638
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3652 src/dialogs.c:2932 src/gtkprefs.c:663
-#: src/gtkprefs.c:1810
+#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2887 src/gtkprefs.c:601
+#: src/gtkprefs.c:1822
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3677
+#: src/protocols/jabber/jabber.c:3664
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
 
-#: src/protocols/jabber/jabber.c:3678
+#: src/protocols/jabber/jabber.c:3665
 msgid "User Identity"
 msgstr "用户标识"
 
-#: src/protocols/jabber/jabber.c:4104
+#: src/protocols/jabber/jabber.c:4094
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4179
+#: src/protocols/jabber/jabber.c:4169
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4201
+#: src/protocols/jabber/jabber.c:4190
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5909
-#: src/protocols/toc/toc.c:1438 src/dialogs.c:2262
+#: src/protocols/jabber/jabber.c:4301 src/protocols/oscar/oscar.c:6082
+#: src/protocols/toc/toc.c:1430 src/dialogs.c:2213
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -1630,18 +1675,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
+#: src/protocols/jabber/jabber.c:4390 src/protocols/jabber/jabber.c:4392
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4427
+#: src/protocols/jabber/jabber.c:4414
 msgid "Resource"
 msgstr "资源"
 
-#: src/protocols/jabber/jabber.c:4435
+#: src/protocols/jabber/jabber.c:4422
 msgid "Connect server"
 msgstr "连接服务器"
 
+#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
+#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:582
+#: src/protocols/msn/msn.c:598 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:649 src/protocols/msn/msn.c:681
+#: src/protocols/msn/msn.c:689 src/protocols/msn/msn.c:722
+#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:744
+#: src/protocols/msn/msn.c:753 src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:776 src/protocols/msn/msn.c:798
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:886
+#: src/protocols/msn/msn.c:979 src/protocols/msn/msn.c:1003
+#: src/protocols/msn/msn.c:1023 src/protocols/msn/msn.c:1034
+#: src/protocols/msn/msn.c:1045 src/protocols/msn/msn.c:1069
+#: src/protocols/msn/msn.c:1081 src/protocols/msn/notification.c:127
+#: src/protocols/msn/notification.c:156 src/protocols/msn/notification.c:949
+#: src/protocols/msn/notification.c:969 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:782 src/protocols/trepia/trepia.c:1065
+#: src/protocols/trepia/trepia.c:1109 src/protocols/trepia/trepia.c:1208
+#: src/protocols/trepia/trepia.c:1264
+msgid "Write error"
+msgstr "写错误"
+
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
 msgstr "协议不支持"
@@ -1674,16 +1743,16 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:405
-#: src/protocols/msn/notification.c:1345
+#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
+#: src/protocols/msn/notification.c:1385
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1352
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1366
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
@@ -1755,7 +1824,7 @@
 msgid "Required fields missing"
 msgstr "缺少必须域"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:188
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:176
 msgid "Not logged in"
 msgstr "未登入"
 
@@ -1852,29 +1921,6 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:91
-#: src/protocols/msn/msn.c:149 src/protocols/msn/msn.c:471
-#: src/protocols/msn/msn.c:582 src/protocols/msn/msn.c:598
-#: src/protocols/msn/msn.c:633 src/protocols/msn/msn.c:649
-#: src/protocols/msn/msn.c:681 src/protocols/msn/msn.c:689
-#: src/protocols/msn/msn.c:722 src/protocols/msn/msn.c:730
-#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:753
-#: src/protocols/msn/msn.c:767 src/protocols/msn/msn.c:776
-#: src/protocols/msn/msn.c:798 src/protocols/msn/msn.c:848
-#: src/protocols/msn/msn.c:886 src/protocols/msn/msn.c:979
-#: src/protocols/msn/msn.c:1003 src/protocols/msn/msn.c:1023
-#: src/protocols/msn/msn.c:1034 src/protocols/msn/msn.c:1045
-#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1081
-#: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
-#: src/protocols/msn/notification.c:909 src/protocols/msn/notification.c:929
-#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
-#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
-#: src/protocols/msn/buddyicon.c:521 src/protocols/trepia/trepia.c:490
-#: src/protocols/trepia/trepia.c:776 src/protocols/trepia/trepia.c:811
-#: src/protocols/trepia/trepia.c:909
-msgid "Write error"
-msgstr "写错误"
-
 #: src/protocols/msn/msn.c:166
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
@@ -1923,12 +1969,12 @@
 msgid "Page"
 msgstr "寻呼"
 
-#: src/protocols/msn/msn.c:236 src/about.c:169 src/dialogs.c:4252
-#: src/prpl.c:516 src/server.c:1473 src/gtkrequest.c:101
+#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4210
+#: src/gtkrequest.c:171 src/server.c:1483
 msgid "Close"
 msgstr "关闭"
 
-#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1134
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1121
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
@@ -1939,31 +1985,31 @@
 msgstr "远离电脑"
 
 #: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:560
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1061
-#: src/protocols/yahoo/yahoo.c:1268 src/protocols/yahoo/yahoo.c:1344
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1048
+#: src/protocols/yahoo/yahoo.c:1255 src/protocols/yahoo/yahoo.c:1331
 msgid "Be Right Back"
 msgstr "马上回来"
 
 #: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:562
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1063
-#: src/protocols/yahoo/yahoo.c:1270 src/protocols/yahoo/yahoo.c:1345
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1050
+#: src/protocols/yahoo/yahoo.c:1257 src/protocols/yahoo/yahoo.c:1332
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:564
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1071
-#: src/protocols/yahoo/yahoo.c:1278 src/protocols/yahoo/yahoo.c:1349
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1058
+#: src/protocols/yahoo/yahoo.c:1265 src/protocols/yahoo/yahoo.c:1336
 msgid "On The Phone"
 msgstr "接听电话"
 
 #: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:566
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1075
-#: src/protocols/yahoo/yahoo.c:1282 src/protocols/yahoo/yahoo.c:1351
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1062
+#: src/protocols/yahoo/yahoo.c:1269 src/protocols/yahoo/yahoo.c:1338
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
 #: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:568
-#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
+#: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "隐身"
 
@@ -2031,7 +2077,7 @@
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1216 src/protocols/trepia/trepia.c:1037
+#: src/protocols/msn/msn.c:1216 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "登录服务器"
 
@@ -2043,7 +2089,7 @@
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/notification.c:297
+#: src/protocols/msn/notification.c:297 src/protocols/trepia/trepia.c:719
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -2063,25 +2109,25 @@
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:457
+#: src/protocols/msn/notification.c:462
 #, 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:717
+#: src/protocols/msn/notification.c:741
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1128
+#: src/protocols/msn/notification.c:1168
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
-#: src/protocols/msn/notification.c:1170
+#: src/protocols/msn/notification.c:1210
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:1306
+#: src/protocols/msn/notification.c:1346
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2096,8 +2142,8 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1081
-#: src/gtkpounce.c:569 src/gtkprefs.c:1505
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1068
+#: src/gtkpounce.c:464 src/gtkprefs.c:1515
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -2110,53 +2156,53 @@
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#: src/protocols/msn/switchboard.c:241
+#: src/protocols/msn/switchboard.c:243
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
-#: src/protocols/napster/napster.c:247
+#: src/protocols/napster/napster.c:232
 msgid "Unable to read header from server"
 msgstr "无法从服务器读取头"
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "用户数:%s,文件数:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:333
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#: src/protocols/napster/napster.c:341
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:397
+#: src/protocols/napster/napster.c:382
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#: src/protocols/napster/napster.c:427
+#: src/protocols/napster/napster.c:412
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:433
+#: src/protocols/napster/napster.c:418
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:546 src/gtkblist.c:1527
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1572
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:560 src/protocols/oscar/oscar.c:5112
-#: src/protocols/toc/toc.c:1192
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5157
+#: src/protocols/toc/toc.c:1175
 msgid "Join what group:"
 msgstr "加入组:"
 
@@ -2170,180 +2216,180 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:172
 msgid "Invalid error"
 msgstr "无效错误"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:173
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:174
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:175
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:177
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:178
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:179
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:180
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:181
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:182
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:183
 msgid "Reply too big"
 msgstr "回复太大"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:184
 msgid "Responses lost"
 msgstr "响应丢失"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:185
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:186
 msgid "Busted SNAC payload"
 msgstr "SNAC 有效负载激增"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:187
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:188
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:189
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:190
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:191
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:192
 msgid "No match"
 msgstr "无匹配"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:193
 msgid "List overflow"
 msgstr "列表溢出"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:194
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:195
 msgid "Queue full"
 msgstr "队列满"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:196
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:468
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "与 %s 的二人世界失败"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:599
-#: src/protocols/toc/toc.c:614 src/protocols/toc/toc.c:677
+#: src/protocols/oscar/oscar.c:526 src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:660
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:853
+#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:836
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:554
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:628 src/protocols/oscar/oscar.c:685
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:670
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:781 src/protocols/oscar/oscar.c:1167
+#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1166
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:788
+#: src/protocols/oscar/oscar.c:786
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:855 src/protocols/oscar/oscar.c:868
-#: src/protocols/oscar/oscar.c:873
+#: src/protocols/oscar/oscar.c:853 src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:871
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:856
+#: src/protocols/oscar/oscar.c:854
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:869
+#: src/protocols/oscar/oscar.c:867
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:874
+#: src/protocols/oscar/oscar.c:872
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1057 src/protocols/toc/toc.c:546
+#: src/protocols/oscar/oscar.c:1055 src/protocols/toc/toc.c:529
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1061
+#: src/protocols/oscar/oscar.c:1059
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1065
+#: src/protocols/oscar/oscar.c:1063
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1069
+#: src/protocols/oscar/oscar.c:1067
 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."
@@ -2352,21 +2398,21 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1073
+#: src/protocols/oscar/oscar.c:1071
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:631
+#: src/protocols/oscar/oscar.c:1075 src/protocols/toc/toc.c:614
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1105
+#: src/protocols/oscar/oscar.c:1103
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1206 src/protocols/oscar/oscar.c:1236
-#: src/protocols/oscar/oscar.c:1324
+#: src/protocols/oscar/oscar.c:1205 src/protocols/oscar/oscar.c:1235
+#: src/protocols/oscar/oscar.c:1323
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2374,29 +2420,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
+#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1326
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1884 src/protocols/oscar/oscar.c:5430
+#: src/protocols/oscar/oscar.c:1895 src/protocols/oscar/oscar.c:5546
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2213 src/protocols/oscar/oscar.c:2235
+#: src/protocols/oscar/oscar.c:2224 src/protocols/oscar/oscar.c:2246
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2381
+#: src/protocols/oscar/oscar.c:2392
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2384
+#: src/protocols/oscar/oscar.c:2395
 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 "
@@ -2405,42 +2451,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2416
+#: src/protocols/oscar/oscar.c:2427
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2424
+#: src/protocols/oscar/oscar.c:2435
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2425
+#: src/protocols/oscar/oscar.c:2436
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2464
 #, 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:2458 src/protocols/oscar/oscar.c:2460
+#: src/protocols/oscar/oscar.c:2469 src/protocols/oscar/oscar.c:2471
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2496 src/protocols/oscar/oscar.c:2498
-#: src/protocols/oscar/oscar.c:2505 src/protocols/oscar/oscar.c:2576
-#: src/protocols/oscar/oscar.c:2596 src/protocols/oscar/oscar.c:2971
-#: src/protocols/oscar/oscar.c:3023 src/protocols/oscar/oscar.c:5033
-#: src/protocols/oscar/oscar.c:5079
+#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:2509
+#: src/protocols/oscar/oscar.c:2516 src/protocols/oscar/oscar.c:2587
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:2982
+#: src/protocols/oscar/oscar.c:3034 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5124
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2504
+#: src/protocols/oscar/oscar.c:2515
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2576
+#: src/protocols/oscar/oscar.c:2587
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2449,11 +2495,11 @@
 "用户 %u 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:2595 src/protocols/oscar/oscar.c:5084
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2596
+#: src/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2463,17 +2509,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2597
+#: src/protocols/oscar/oscar.c:2608
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2604
+#: src/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2623
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2486,7 +2532,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2620
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2499,7 +2545,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2512,32 +2558,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2649
+#: src/protocols/oscar/oscar.c:2660
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个联系人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2655
+#: src/protocols/oscar/oscar.c:2666
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您是否想要将此联系人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2670
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2741
+#: src/protocols/oscar/oscar.c:2752
 #, 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:2750
+#: src/protocols/oscar/oscar.c:2761
 #, 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:2759
+#: src/protocols/oscar/oscar.c:2770
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2545,167 +2591,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:2768
+#: src/protocols/oscar/oscar.c:2779
 #, 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:2777
+#: src/protocols/oscar/oscar.c:2788
 #, 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:2786
+#: src/protocols/oscar/oscar.c:2797
 #, 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:2802 src/protocols/oscar/oscar.c:4510
-#: src/protocols/oscar/oscar.c:5719
+#: src/protocols/oscar/oscar.c:2813 src/protocols/oscar/oscar.c:4549
+#: src/protocols/oscar/oscar.c:5835
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2806 src/protocols/oscar/oscar.c:4504
-#: src/protocols/oscar/oscar.c:5717
+#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4543
+#: src/protocols/oscar/oscar.c:5833
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2808 src/protocols/oscar/oscar.c:4507
-#: src/protocols/oscar/oscar.c:5718
+#: src/protocols/oscar/oscar.c:2819 src/protocols/oscar/oscar.c:4546
+#: src/protocols/oscar/oscar.c:5834
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2812
+#: src/protocols/oscar/oscar.c:2823
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2872
+#: src/protocols/oscar/oscar.c:2883
 #, 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:2874
+#: src/protocols/oscar/oscar.c:2885
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2933
+#: src/protocols/oscar/oscar.c:2944
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2934
+#: src/protocols/oscar/oscar.c:2945
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2969
+#: src/protocols/oscar/oscar.c:2980
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:3021
+#: src/protocols/oscar/oscar.c:3032
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/protocols/oscar/oscar.c:3055
+#: src/protocols/oscar/oscar.c:3066 src/gtkaccount.c:305
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:3058
+#: src/protocols/oscar/oscar.c:3069
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3061 src/protocols/oscar/oscar.c:5743
+#: src/protocols/oscar/oscar.c:3072 src/protocols/oscar/oscar.c:5864
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:3064 src/gtkblist.c:1536
+#: src/protocols/oscar/oscar.c:3075 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3067 src/protocols/oscar/oscar.c:5755
+#: src/protocols/oscar/oscar.c:3078 src/protocols/oscar/oscar.c:5880
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3070 src/protocols/oscar/oscar.c:5749
+#: src/protocols/oscar/oscar.c:3081 src/protocols/oscar/oscar.c:5872
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3074
+#: src/protocols/oscar/oscar.c:3085
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3077
+#: src/protocols/oscar/oscar.c:3088
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3091
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3094
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:3086
+#: src/protocols/oscar/oscar.c:3097
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3100
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3103
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3106
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3109
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3112
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3155
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3151
+#: src/protocols/oscar/oscar.c:3162
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3156
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3162
+#: src/protocols/oscar/oscar.c:3173
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3176
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3167
+#: src/protocols/oscar/oscar.c:3178
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2718,206 +2764,206 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3199
+#: src/protocols/oscar/oscar.c:3210
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3210
+#: src/protocols/oscar/oscar.c:3221
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3216
+#: src/protocols/oscar/oscar.c:3227
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3240
+#: src/protocols/oscar/oscar.c:3251
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3639
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3601
+#: src/protocols/oscar/oscar.c:3640
 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:3661
+#: src/protocols/oscar/oscar.c:3700
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3663
+#: src/protocols/oscar/oscar.c:3702
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3891
+#: src/protocols/oscar/oscar.c:3930
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:3935
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:3938
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3902 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3941 src/protocols/oscar/oscar.c:3947
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3913
+#: src/protocols/oscar/oscar.c:3952
 msgid "Mobile Phone:"
 msgstr "移动电话:"
 
-#: src/protocols/oscar/oscar.c:3916
+#: src/protocols/oscar/oscar.c:3955
 msgid "Gender:"
 msgstr "性别:"
 
-#: src/protocols/oscar/oscar.c:3916
+#: src/protocols/oscar/oscar.c:3955 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3916
+#: src/protocols/oscar/oscar.c:3955 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:3964
 msgid "Birthday:"
 msgstr "生日:"
 
-#: src/protocols/oscar/oscar.c:3930
+#: src/protocols/oscar/oscar.c:3969
 msgid "Age:"
 msgstr "年龄:"
 
-#: src/protocols/oscar/oscar.c:3933
+#: src/protocols/oscar/oscar.c:3972
 msgid "Personal Web Page:"
 msgstr "个人主页:"
 
-#: src/protocols/oscar/oscar.c:3936
+#: src/protocols/oscar/oscar.c:3975
 msgid "Additional Information:"
 msgstr "额外信息:"
 
-#: src/protocols/oscar/oscar.c:3940
+#: src/protocols/oscar/oscar.c:3979
 msgid "Home Address:"
 msgstr "家庭住址:"
 
-#: src/protocols/oscar/oscar.c:3942 src/protocols/oscar/oscar.c:3958
+#: src/protocols/oscar/oscar.c:3981 src/protocols/oscar/oscar.c:3997
 msgid "Address:"
 msgstr "地址:"
 
-#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3961
+#: src/protocols/oscar/oscar.c:3984 src/protocols/oscar/oscar.c:4000
 msgid "City:"
 msgstr "城市:"
 
-#: src/protocols/oscar/oscar.c:3948 src/protocols/oscar/oscar.c:3964
+#: src/protocols/oscar/oscar.c:3987 src/protocols/oscar/oscar.c:4003
 msgid "State:"
 msgstr "州/省:"
 
-#: src/protocols/oscar/oscar.c:3951 src/protocols/oscar/oscar.c:3967
+#: src/protocols/oscar/oscar.c:3990 src/protocols/oscar/oscar.c:4006
 msgid "Zip Code:"
 msgstr "邮政编码:"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3995
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:3972
+#: src/protocols/oscar/oscar.c:4011
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:4013
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:4016
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:4019
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:4022
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4090
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 拥有下列用户名:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4069
+#: src/protocols/oscar/oscar.c:4108
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4131
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4120
+#: src/protocols/oscar/oscar.c:4159
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4162
 #, 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:4126
+#: src/protocols/oscar/oscar.c:4165
 #, 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:4129
+#: src/protocols/oscar/oscar.c:4168
 #, 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:4132
+#: src/protocols/oscar/oscar.c:4171
 #, 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:4135
+#: src/protocols/oscar/oscar.c:4174
 #, 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:4138
+#: src/protocols/oscar/oscar.c:4177
 #, 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:4141
+#: src/protocols/oscar/oscar.c:4180
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4190
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2926,20 +2972,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4152 src/protocols/oscar/oscar.c:4159
+#: src/protocols/oscar/oscar.c:4191 src/protocols/oscar/oscar.c:4198
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4157
+#: src/protocols/oscar/oscar.c:4196
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4381
+#: src/protocols/oscar/oscar.c:4420
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4382
+#: src/protocols/oscar/oscar.c:4421
 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 "
@@ -2948,22 +2994,22 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4411
+#: src/protocols/oscar/oscar.c:4450
 #, 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:4413
+#: src/protocols/oscar/oscar.c:4452
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4429
+#: src/protocols/oscar/oscar.c:4468
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4430
+#: src/protocols/oscar/oscar.c:4469
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2972,7 +3018,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4469
+#: src/protocols/oscar/oscar.c:4508
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -2981,29 +3027,29 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4510
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4684
-msgid "Unable To Retrive Buddy List"
+#: src/protocols/oscar/oscar.c:4729
+msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4685
+#: src/protocols/oscar/oscar.c:4730
 msgid ""
-"Gaim was temporarily unable to retrive your buddy list from the AIM "
+"Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 msgstr ""
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4776 src/protocols/oscar/oscar.c:4777
-#: src/protocols/oscar/oscar.c:4782
+#: src/protocols/oscar/oscar.c:4821 src/protocols/oscar/oscar.c:4822
+#: src/protocols/oscar/oscar.c:4827
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:4946
+#: src/protocols/oscar/oscar.c:4991
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3011,15 +3057,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:4946 src/protocols/oscar/oscar.c:4959
+#: src/protocols/oscar/oscar.c:4991 src/protocols/oscar/oscar.c:5004
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:4947 src/protocols/oscar/oscar.c:4960
+#: src/protocols/oscar/oscar.c:4992 src/protocols/oscar/oscar.c:5005
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:4959
+#: src/protocols/oscar/oscar.c:5004
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3029,18 +3075,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:4994
+#: src/protocols/oscar/oscar.c:5039
 #, 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:5000
+#: src/protocols/oscar/oscar.c:5045
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:5033
+#: src/protocols/oscar/oscar.c:5078
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3050,17 +3096,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5075
+#: src/protocols/oscar/oscar.c:5120
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5076
+#: src/protocols/oscar/oscar.c:5121
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5079
+#: src/protocols/oscar/oscar.c:5124
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3070,87 +3116,91 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5080
+#: src/protocols/oscar/oscar.c:5125
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5117 src/protocols/toc/toc.c:1197
+#: src/protocols/oscar/oscar.c:5162 src/protocols/toc/toc.c:1180
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5337
+#: src/protocols/oscar/oscar.c:5382
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5391
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5353
+#: src/protocols/oscar/oscar.c:5398
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5361
+#: src/protocols/oscar/oscar.c:5404
+msgid "<b>Available:</b> "
+msgstr "<b>可用:</b>"
+
+#: src/protocols/oscar/oscar.c:5412
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5365 src/gtkblist.c:852
+#: src/protocols/oscar/oscar.c:5416 src/gtkblist.c:895
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5391
+#: src/protocols/oscar/oscar.c:5446
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5572
+#: src/protocols/oscar/oscar.c:5688
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5585
+#: src/protocols/oscar/oscar.c:5701
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5588
+#: src/protocols/oscar/oscar.c:5704
 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:5733
+#: src/protocols/oscar/oscar.c:5849
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5767
+#: src/protocols/oscar/oscar.c:5893
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:5914
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:5915
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:5795
+#: src/protocols/oscar/oscar.c:5921
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:5970
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5857
+#: src/protocols/oscar/oscar.c:5983
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:6008
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:5887
+#: src/protocols/oscar/oscar.c:6013
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3159,31 +3209,43 @@
 "%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
 "单击“重新请求认证”。"
 
-#: src/protocols/oscar/oscar.c:5922
+#: src/protocols/oscar/oscar.c:6029
+msgid "Available Message:"
+msgstr "可用消息:"
+
+#: src/protocols/oscar/oscar.c:6030
+msgid "Please talk to me, I'm lonely! (and single)"
+msgstr "孤独的人是可耻的,跟我聊聊吧!"
+
+#: src/protocols/oscar/oscar.c:6089
+msgid "Set Available Message"
+msgstr "设置可用消息"
+
+#: src/protocols/oscar/oscar.c:6103
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:6114
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:5939
+#: src/protocols/oscar/oscar.c:6120
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:5945
+#: src/protocols/oscar/oscar.c:6126
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5951
+#: src/protocols/oscar/oscar.c:6132
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5960
+#: src/protocols/oscar/oscar.c:6141
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:5968
+#: src/protocols/oscar/oscar.c:6149
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -3197,122 +3259,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6088 src/protocols/oscar/oscar.c:6090
+#: src/protocols/oscar/oscar.c:6270 src/protocols/oscar/oscar.c:6272
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6107
+#: src/protocols/oscar/oscar.c:6289
 msgid "Auth host"
 msgstr "认证主机"
 
-#: src/protocols/oscar/oscar.c:6112
+#: src/protocols/oscar/oscar.c:6294
 msgid "Auth port"
 msgstr "认证端口"
 
-#: src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:173
 #, c-format
 msgid "Looking up %s"
 msgstr "查阅 %s"
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:468
 #, c-format
 msgid "Unable to write file %s."
 msgstr "无法写入文件 %s。"
 
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:471
 #, c-format
 msgid "Unable to read file %s."
 msgstr "无法读取文件 %s。"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:474
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "消息太长,最后 %s 字节被截断。"
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:477
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前未登入。"
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许对 %s 发出警告。"
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:483
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中无法聊天。"
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您给 %s 发送消息的速度太快。"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:495
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:498
 msgid "Failure."
 msgstr "失败。"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:501
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:504
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:507
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:510
 msgid "Email lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:513
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:516
 msgid "No keywords."
 msgstr "无关键字。"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:519
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:523
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知失败:%s。"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:532
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:535
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:538
 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."
@@ -3320,37 +3382,37 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生了未知登入错误:%s。"
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:543
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "发生了未知错误 %d。信息:%s"
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:563
 msgid "Connection Closed"
 msgstr "连接已关闭"
 
-#: src/protocols/toc/toc.c:618
+#: src/protocols/toc/toc.c:601
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:683
+#: src/protocols/toc/toc.c:666
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:871
+#: src/protocols/toc/toc.c:854
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:875
+#: src/protocols/toc/toc.c:858
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:859
 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 "
@@ -3360,47 +3422,47 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1320
+#: src/protocols/toc/toc.c:1312
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1444
+#: src/protocols/toc/toc.c:1436
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1567
+#: src/protocols/toc/toc.c:1559
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1603
+#: src/protocols/toc/toc.c:1595
 msgid "File transfer failed; other side probably canceled."
 msgstr "文件传送失败;可能其中一端取消了传送。"
 
-#: src/protocols/toc/toc.c:1648 src/protocols/toc/toc.c:1688
-#: src/protocols/toc/toc.c:1900
+#: src/protocols/toc/toc.c:1640 src/protocols/toc/toc.c:1680
+#: src/protocols/toc/toc.c:1892
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1812
+#: src/protocols/toc/toc.c:1804
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1845
+#: src/protocols/toc/toc.c:1837
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:1945 src/gtkft.c:1075
+#: src/protocols/toc/toc.c:1937 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:1979
+#: src/protocols/toc/toc.c:1971
 #, 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:1986
+#: src/protocols/toc/toc.c:1978
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
@@ -3415,60 +3477,179 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
+#: src/protocols/toc/toc.c:2053 src/protocols/toc/toc.c:2055
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2080
+#: src/protocols/toc/toc.c:2072
 msgid "TOC host"
 msgstr "TOC 主机"
 
-#: src/protocols/toc/toc.c:2084
+#: src/protocols/toc/toc.c:2076
 msgid "TOC port"
 msgstr "TOC 端口"
 
-#: src/protocols/yahoo/yahoo.c:601
+#. Basic Profile group.
+#: src/protocols/trepia/trepia.c:296
+msgid "Basic Profile"
+msgstr "基本信息"
+
+#. First Name
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1971 src/dialogs.c:2625
+msgid "First Name"
+msgstr "名"
+
+#. Last Name
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1994 src/dialogs.c:2645
+msgid "Last Name"
+msgstr "姓"
+
+#. Gender
+#: src/protocols/trepia/trepia.c:312
+msgid "Gender"
+msgstr "性别"
+
+#. Age
+#: src/protocols/trepia/trepia.c:318
+msgid "Age"
+msgstr "年龄"
+
+#. Homepage
+#: src/protocols/trepia/trepia.c:322
+msgid "Homepage"
+msgstr "主页"
+
+#. E-Mail Address
+#: src/protocols/trepia/trepia.c:327
+msgid "E-Mail Address"
+msgstr "电子邮件地址"
+
+#: src/protocols/trepia/trepia.c:333
+msgid "Profile Information"
+msgstr "个人信息"
+
+#. Instant Messagers
+#: src/protocols/trepia/trepia.c:339
+msgid "Instant Messagers"
+msgstr "即时通讯程序"
+
+#. AIM
+#: src/protocols/trepia/trepia.c:343
+msgid "AIM"
+msgstr "AIM"
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:347
+msgid "ICQ UIN"
+msgstr "ICQ UIN"
+
+#. MSN
+#: src/protocols/trepia/trepia.c:351
+msgid "MSN"
+msgstr "MSN"
+
+#. Yahoo
+#: src/protocols/trepia/trepia.c:355
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. I'm From
+#: src/protocols/trepia/trepia.c:360
+msgid "I'm From"
+msgstr "来自"
+
+#. State
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2027 src/dialogs.c:2674
+msgid "State"
+msgstr "州/省"
+
+#. Call the dialog.
+#: src/protocols/trepia/trepia.c:377
+msgid "Set your Trepia profile data."
+msgstr "设置您的 Trepia 资料。"
+
+#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2069 src/dialogs.c:2250
+#: src/dialogs.c:3415 src/dialogs.c:4219 src/dialogs.c:4949
+#: src/gtkrequest.c:175
+msgid "Save"
+msgstr "保存"
+
+#: src/protocols/trepia/trepia.c:523
+msgid "Set Profile"
+msgstr "设置资料"
+
+#: src/protocols/trepia/trepia.c:559
+msgid "Visit Homepage"
+msgstr "浏览主页"
+
+#: src/protocols/trepia/trepia.c:905 src/protocols/trepia/trepia.c:908
+msgid "Local Users"
+msgstr "本地用户"
+
+#: src/protocols/trepia/trepia.c:1004
+msgid "Read error"
+msgstr "读取错误"
+
+#: src/protocols/trepia/trepia.c:1105
+msgid "Logging in"
+msgstr "登入"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/trepia/trepia.c:1353 src/protocols/trepia/trepia.c:1355
+msgid "Trepia Protocol Plugin"
+msgstr "Trepia 协议插件"
+
+#: src/protocols/yahoo/yahoo.c:587
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:1065 src/protocols/yahoo/yahoo.c:1272
-#: src/protocols/yahoo/yahoo.c:1346
+#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1259
+#: src/protocols/yahoo/yahoo.c:1333
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1067 src/protocols/yahoo/yahoo.c:1274
-#: src/protocols/yahoo/yahoo.c:1347
+#: src/protocols/yahoo/yahoo.c:1054 src/protocols/yahoo/yahoo.c:1261
+#: src/protocols/yahoo/yahoo.c:1334
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:1069 src/protocols/yahoo/yahoo.c:1276
-#: src/protocols/yahoo/yahoo.c:1348
+#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1263
+#: src/protocols/yahoo/yahoo.c:1335
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1280
-#: src/protocols/yahoo/yahoo.c:1350
+#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1267
+#: src/protocols/yahoo/yahoo.c:1337
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1284
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/yahoo/yahoo.c:1064 src/protocols/yahoo/yahoo.c:1271
+#: src/protocols/yahoo/yahoo.c:1339
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:1193
+#: src/protocols/yahoo/yahoo.c:1180
 msgid "Active which ID?"
 msgstr "激活哪个 ID?"
 
-#: src/protocols/yahoo/yahoo.c:1204
+#: src/protocols/yahoo/yahoo.c:1191
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/yahoo/yahoo.c:1416
 msgid "Pager Host:"
 msgstr "寻呼主机:"
 
-#: src/protocols/yahoo/yahoo.c:1435
+#: src/protocols/yahoo/yahoo.c:1422
 msgid "Pager Port:"
 msgstr "寻呼端口:"
 
@@ -3482,46 +3663,46 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1521 src/protocols/yahoo/yahoo.c:1523
+#: src/protocols/yahoo/yahoo.c:1508 src/protocols/yahoo/yahoo.c:1510
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: src/protocols/yahoo/yahoo.c:1540
+#: src/protocols/yahoo/yahoo.c:1527
 msgid "Pager host"
 msgstr "寻呼主机"
 
-#: src/protocols/yahoo/yahoo.c:1545
+#: src/protocols/yahoo/yahoo.c:1532
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:337
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>用户:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:339
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>别名:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:341
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隐身或未登入"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:345
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: src/protocols/zephyr/zephyr.c:573 src/protocols/zephyr/zephyr.c:574
+#: src/protocols/zephyr/zephyr.c:574 src/protocols/zephyr/zephyr.c:575
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:598
+#: src/protocols/zephyr/zephyr.c:599
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:599
+#: src/protocols/zephyr/zephyr.c:600
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -3529,19 +3710,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:848
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:887
+#: src/protocols/zephyr/zephyr.c:888
 msgid "Class:"
 msgstr "类:"
 
-#: src/protocols/zephyr/zephyr.c:892
+#: src/protocols/zephyr/zephyr.c:893
 msgid "Instance:"
 msgstr "实例:"
 
-#: src/protocols/zephyr/zephyr.c:897
+#: src/protocols/zephyr/zephyr.c:898
 msgid "Recipient:"
 msgstr "接受者:"
 
@@ -3555,16 +3736,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
+#: src/protocols/zephyr/zephyr.c:1030 src/protocols/zephyr/zephyr.c:1032
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: src/about.c:74
+#: src/about.c:56
 #, c-format
 msgid "About Gaim v%s"
 msgstr "关于 Gaim v%s"
 
-#: src/about.c:106
+#: src/about.c:88
 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 "
@@ -3574,15 +3755,15 @@
 "Jabber,Napster,Zephyr 和 Gadu-Gadu。本程序用 Gtk+ 写成,并以 GPL 许可协议发"
 "行。<BR><BR>"
 
-#: src/about.c:116
+#: src/about.c:98
 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
+#: src/about.c:102
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">当前开发者:</FONT><BR>"
 
-#: src/about.c:122
+#: src/about.c:104
 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:"
@@ -3600,15 +3781,15 @@
 "'faceprint' Walp (开发者)<BR>  Mark 'KingAnt' Doliner (开发者)<BR>  Luke "
 "'LSchiere' Schierer (支持)<BR><BR>"
 
-#: src/about.c:137
+#: src/about.c:119
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">疯狂补丁开发者:</FONT><BR>"
 
-#: src/about.c:147
+#: src/about.c:129
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">退休开发者:</FONT><BR>"
 
-#: src/about.c:149
+#: src/about.c:131
 msgid ""
 "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
 "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
@@ -3623,31 +3804,31 @@
 "Spencer (原始作者) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (骇客和专属驱动程序[lazy bum])<BR><BR>"
 
-#: src/away.c:222
+#: src/away.c:223
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
 
-#: src/away.c:282
+#: src/away.c:283
 msgid "I'm Back!"
 msgstr "我回来了!"
 
-#: src/away.c:387
+#: src/away.c:388
 msgid "New Away Message"
 msgstr "新建离开消息"
 
-#: src/away.c:407
+#: src/away.c:408
 msgid "Remove Away Message"
 msgstr "删除离开消息"
 
-#: src/away.c:602
+#: src/away.c:603
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:369 src/gtkprefs.c:2260
+#: src/blist.c:379 src/gtkprefs.c:2274
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:693
+#: src/blist.c:703
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3656,134 +3837,134 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:698
+#: src/blist.c:708
 msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:887
+#: src/blist.c:898
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:1614
+#: src/blist.c:1654
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:1616
+#: src/blist.c:1656
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1622
+#: src/blist.c:1664
 #, 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:1625
+#: src/blist.c:1667
 msgid "Converting Buddy List"
 msgstr "正在转换好友列表"
 
-#: src/browser.c:430 src/browser.c:458
+#: src/browser.c:407 src/browser.c:435
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr "与浏览器通讯出现问题。请关闭所有窗口,稍后再试一次。"
 
-#: src/browser.c:592
+#: src/browser.c:569
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
 msgstr "无法调用您的浏览器,原因是选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/browser.c:609
+#: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "调用您选择的浏览器 %s 出错"
 
-#: src/buddy_chat.c:255 src/dialogs.c:1377
+#: src/buddy_chat.c:316 src/dialogs.c:1325
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/buddy_chat.c:269
+#: src/buddy_chat.c:330
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:275
+#: src/buddy_chat.c:336
 msgid "Buddy Chat"
 msgstr "好友聊天"
 
-#: src/buddy_chat.c:285
+#: src/buddy_chat.c:346
 msgid "Join Chat As:"
 msgstr "加入聊天为:"
 
 #. Join button.
-#: src/buddy_chat.c:308
+#: src/buddy_chat.c:369
 msgid "Join"
 msgstr "加入"
 
-#: src/conversation.c:408
+#: src/conversation.c:399
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:416
+#: src/conversation.c:407
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1920
+#: src/conversation.c:1914
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1923
+#: src/conversation.c:1917
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:1973
+#: src/conversation.c:1967
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2015
+#: src/conversation.c:2009
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2017
+#: src/conversation.c:2011
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2212
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2205
+#: src/conversation.c:2214
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2207
+#: src/conversation.c:2216
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2209
+#: src/conversation.c:2218
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:347
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:347
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:363
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3795,89 +3976,89 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:389
+#: src/dialogs.c:372
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:396
+#: src/dialogs.c:379
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:478
+#: src/dialogs.c:460
 #, 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:480 src/dialogs.c:481
+#: src/dialogs.c:462 src/dialogs.c:463
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:489
+#: src/dialogs.c:471
 #, 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:492 src/dialogs.c:493
+#: src/dialogs.c:474 src/dialogs.c:475
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:646
+#: src/dialogs.c:624
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:664
+#: src/dialogs.c:642
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:680 src/dialogs.c:786 src/dialogs.c:3789
+#: src/dialogs.c:658 src/dialogs.c:735 src/dialogs.c:3747
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:695 src/dialogs.c:802 src/gtkpounce.c:519
+#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:755
+#: src/dialogs.c:704
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:774
+#: src/dialogs.c:723
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:881
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:974
+#: src/dialogs.c:898
 msgid "Please enter the name of the group to be added.\n"
 msgstr "请输入要添加的组名称。\n"
 
-#: src/dialogs.c:983 src/dialogs.c:4340
+#: src/dialogs.c:907 src/dialogs.c:4298
 msgid "_Group:"
 msgstr "组(_G):"
 
-#: src/dialogs.c:1070
+#: src/dialogs.c:943
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/dialogs.c:1089
+#: src/dialogs.c:962
 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. "
@@ -3886,351 +4067,335 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/dialogs.c:1108
+#: src/dialogs.c:981
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/dialogs.c:1121
+#: src/dialogs.c:994
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:1131
+#: src/dialogs.c:1004
 msgid "Group"
 msgstr "组"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1140
+#: src/dialogs.c:1013
 msgid "Add To"
 msgstr "添加到"
 
-#: src/dialogs.c:1384
+#: src/dialogs.c:1332
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/dialogs.c:1407
+#: src/dialogs.c:1355
 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:1416
+#: src/dialogs.c:1364
 msgid "Account:"
 msgstr "账户:"
 
-#: src/dialogs.c:1435 src/gtkaccount.c:318
+#: src/dialogs.c:1383 src/gtkaccount.c:455
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/dialogs.c:1446
+#: src/dialogs.c:1394
 msgid "Group:"
 msgstr "组:"
 
-#: src/dialogs.c:1783
+#: src/dialogs.c:1731
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/dialogs.c:1794
+#: src/dialogs.c:1742
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
-#: src/dialogs.c:1803
+#: src/dialogs.c:1751
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/dialogs.c:1820
+#: src/dialogs.c:1768
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/dialogs.c:1824
+#: src/dialogs.c:1772
 msgid "Allow only users on my buddy list"
 msgstr "只允许我的好友联系我"
 
-#: src/dialogs.c:1828
+#: src/dialogs.c:1776
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/dialogs.c:1866
+#: src/dialogs.c:1814
 msgid "Deny all users"
 msgstr "拒绝所有用户"
 
-#: src/dialogs.c:1870
+#: src/dialogs.c:1818
 msgid "Block the users below"
 msgstr "屏蔽以下用户"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1937
 msgid "Set Directory Info"
 msgstr "设置目录信息"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1945
 msgid "Directory Info"
 msgstr "目录信息"
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:1955
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "设置 %s 的目录信息:"
 
-#: src/dialogs.c:2018
+#: src/dialogs.c:1968
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许搜索引擎查找您的信息"
 
-#. Line 1
-#: src/dialogs.c:2021 src/dialogs.c:2670
-msgid "First Name"
-msgstr "名"
-
 #. Line 2
-#: src/dialogs.c:2032 src/dialogs.c:2680
+#: src/dialogs.c:1982 src/dialogs.c:2635
 msgid "Middle Name"
 msgstr "中名"
 
-#. Line 3
-#: src/dialogs.c:2044 src/dialogs.c:2690
-msgid "Last Name"
-msgstr "姓"
-
 #. Line 4
-#: src/dialogs.c:2055 src/dialogs.c:2700
+#: src/dialogs.c:2005 src/dialogs.c:2655
 msgid "Maiden Name"
 msgstr "娘家名"
 
-#. Line 6
-#: src/dialogs.c:2077 src/dialogs.c:2719
-msgid "State"
-msgstr "州/省"
-
-#: src/dialogs.c:2119 src/dialogs.c:2295 src/dialogs.c:3458 src/dialogs.c:4261
-#: src/dialogs.c:5011
-msgid "Save"
-msgstr "保存"
-
-#: src/dialogs.c:2142
+#: src/dialogs.c:2092
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: src/dialogs.c:2148
+#: src/dialogs.c:2098
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: src/dialogs.c:2193
+#: src/dialogs.c:2143
 #, c-format
 msgid "Changing password for %s:"
 msgstr "更改 %s 的密码:"
 
-#: src/dialogs.c:2201
+#: src/dialogs.c:2151
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:2212
+#: src/dialogs.c:2162
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:2223
+#: src/dialogs.c:2173
 msgid "New Password (again)"
 msgstr "再次输入新密码"
 
-#: src/dialogs.c:2271
+#: src/dialogs.c:2222
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的信息:"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2308
 msgid "Below are the results of your search: "
 msgstr "下面是您搜索的结果:"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2419
 msgid "Permit"
 msgstr "许可"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2451
 msgid "Add Permit"
 msgstr "添加许可"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2453
 msgid "Add Deny"
 msgstr "添加拒绝"
 
-#: src/dialogs.c:2565
+#: src/dialogs.c:2520
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2646 src/dialogs.c:2779
+#: src/dialogs.c:2601 src/dialogs.c:2734
 msgid "Search for Buddy"
 msgstr "搜索好友"
 
-#: src/dialogs.c:2746
+#: src/dialogs.c:2701
 msgid "Find Buddy By Info"
 msgstr "按信息查找好友"
 
-#: src/dialogs.c:2773
+#: src/dialogs.c:2728
 msgid "Find Buddy By Email"
 msgstr "按电子邮件查找好友"
 
-#: src/dialogs.c:2877
+#: src/dialogs.c:2832
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2879
+#: src/dialogs.c:2834
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2898
+#: src/dialogs.c:2853
 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:3067 src/dialogs.c:3084
+#: src/dialogs.c:3022 src/dialogs.c:3039
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:3119 src/dialogs.c:3136
+#: src/dialogs.c:3074 src/dialogs.c:3091
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:3231 src/dialogs.c:3257
+#: src/dialogs.c:3188 src/dialogs.c:3214
 msgid "Select Font"
 msgstr "选择字体"
 
-#: src/dialogs.c:3322
+#: src/dialogs.c:3279
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:3324
+#: src/dialogs.c:3281
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#: src/dialogs.c:3334
+#: src/dialogs.c:3291
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:3399 src/dialogs.c:3407
+#: src/dialogs.c:3356 src/dialogs.c:3364
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:3417
+#: src/dialogs.c:3374
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:3462
+#: src/dialogs.c:3419
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3423
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3614
+#: src/dialogs.c:3572
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3660 src/dialogs.c:3738
+#: src/dialogs.c:3618
+msgid "Alias Chat"
+msgstr "给聊天起名"
+
+#. Setup the label containing the description.
+#: src/dialogs.c:3647
+msgid "Please enter an aliased name for this chat.\n"
+msgstr "请输入此聊天的别名。\n"
+
+#: src/dialogs.c:3659 src/dialogs.c:3761
+msgid "_Alias:"
+msgstr "别名(_A):"
+
+#: src/dialogs.c:3696
 msgid "Alias Buddy"
 msgstr "好友别名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3689
-msgid "Please enter an aliased name for this chat.\n"
-msgstr "请输入此聊天的别名。\n"
-
-#: src/dialogs.c:3701 src/dialogs.c:3803
-msgid "_Alias:"
-msgstr "别名(_A):"
-
-#. Setup the label containing the description.
-#: src/dialogs.c:3768
+#: src/dialogs.c:3726
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
 
-#: src/dialogs.c:3857 src/dialogs.c:3864
+#: src/dialogs.c:3815 src/dialogs.c:3822
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3888
+#: src/dialogs.c:3846
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3918
+#: src/dialogs.c:3876
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3937
+#: src/dialogs.c:3895
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3946
+#: src/dialogs.c:3904
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:3949
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:4133
+#: src/dialogs.c:4091
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:4093
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:4156
+#: src/dialogs.c:4114
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "无法打开日志文件 %s"
 
-#: src/dialogs.c:4177
+#: src/dialogs.c:4135
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4234
+#: src/dialogs.c:4192
 msgid "Log"
 msgstr "日志"
 
-#: src/dialogs.c:4256
+#: src/dialogs.c:4214
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4314
+#: src/dialogs.c:4272
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:4331
+#: src/dialogs.c:4289
 msgid "Please enter a new name for the selected group.\n"
 msgstr "请输入选中组的新名字。\n"
 
-#: src/dialogs.c:4407 src/dialogs.c:4416
+#: src/dialogs.c:4365 src/dialogs.c:4374
 msgid "Rename Buddy"
 msgstr "重命名好友"
 
-#: src/dialogs.c:4423
+#: src/dialogs.c:4381
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/ft.c:135
+#: src/ft.c:121
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:149
+#: src/ft.c:135
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:741
+#: src/ft.c:727
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:743
+#: src/ft.c:729
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -4317,163 +4482,318 @@
 "关闭 Gaim 的运行副本\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:53
+#: src/gaimrc.c:41
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1480
+#: src/gaimrc.c:360 src/gaimrc.c:1503
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1578
+#: src/gaimrc.c:1601
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gtkblist.c:405
+#: src/gtkaccount.c:280
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>文件:</b> %s\n"
+"<b>文件大小:</b> %s\n"
+"<b>图像大小:</b> %dx%d"
+
+#. Build the login options frame.
+#: src/gtkaccount.c:355
+msgid "Login Options"
+msgstr "登入选项"
+
+#: src/gtkaccount.c:372
+msgid "Protocol:"
+msgstr "协议:"
+
+#: src/gtkaccount.c:377
+msgid "Screenname:"
+msgstr "用户名:"
+
+#: src/gtkaccount.c:459
+msgid "Remember password"
+msgstr "记住密码"
+
+#. Build the user options frame.
+#: src/gtkaccount.c:513
+msgid "User Options"
+msgstr "用户选项"
+
+#: src/gtkaccount.c:526
+msgid "New mail notifications"
+msgstr "新邮件通知"
+
+#: src/gtkaccount.c:535
+msgid "Buddy icon file:"
+msgstr "好友图标文件:"
+
+#: src/gtkaccount.c:544
+msgid "_Browse"
+msgstr "浏览(_B)"
+
+#: src/gtkaccount.c:550
+msgid "_Reset"
+msgstr "重置(_R)"
+
+#. Build the protocol options frame.
+#: src/gtkaccount.c:611
+#, c-format
+msgid "%s Options"
+msgstr "%s 选项"
+
+#. Use Global Proxy Settings
+#: src/gtkaccount.c:732
+msgid "Use Global Proxy Settings"
+msgstr "使用全局代理设置"
+
+#. No Proxy
+#: src/gtkaccount.c:739
+msgid "No Proxy"
+msgstr "无代理"
+
+#. SOCKS 4
+#: src/gtkaccount.c:746
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#. SOCKS 5
+#: src/gtkaccount.c:753
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#. HTTP
+#: src/gtkaccount.c:760
+msgid "HTTP"
+msgstr "HTTP"
+
+#: src/gtkaccount.c:792
+msgid "you can see the butterflies mating"
+msgstr ""
+
+#: src/gtkaccount.c:796
+msgid "If you look real closely"
+msgstr ""
+
+#: src/gtkaccount.c:812
+msgid "Proxy Options"
+msgstr "代理选项"
+
+#: src/gtkaccount.c:828 src/gtkprefs.c:1099
+msgid "Proxy _type:"
+msgstr "代理类型(_T):"
+
+#: src/gtkaccount.c:837
+msgid "_Host:"
+msgstr "主机(_H):"
+
+#: src/gtkaccount.c:841
+msgid "_Port:"
+msgstr "端口(_P):"
+
+#: src/gtkaccount.c:849
+msgid "_Username:"
+msgstr "用户名(_U):"
+
+#: src/gtkaccount.c:854
+msgid "Pa_ssword:"
+msgstr "密码(_S):"
+
+#: src/gtkaccount.c:1165
+msgid "Add Account"
+msgstr "添加账户"
+
+#: src/gtkaccount.c:1167
+msgid "Modify Account"
+msgstr "修改账户"
+
+#. Add the disclosure
+#: src/gtkaccount.c:1191
+msgid "Show more options"
+msgstr "显示全部选项"
+
+#: src/gtkaccount.c:1192
+msgid "Show fewer options"
+msgstr "显示主要选项"
+
+#. Register button
+#: src/gtkaccount.c:1220
+msgid "Register"
+msgstr "注册"
+
+#: src/gtkaccount.c:1507
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: src/gtkaccount.c:1511 src/gtkrequest.c:172
+msgid "Delete"
+msgstr "删除"
+
+#: src/gtkaccount.c:1589
+msgid "Screenname"
+msgstr "用户名"
+
+#: src/gtkaccount.c:1630
+msgid "Protocol"
+msgstr "协议"
+
+#: src/gtkblist.c:409
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:406
+#: src/gtkblist.c:411
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:407
+#: src/gtkblist.c:413
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:408
+#: src/gtkblist.c:415
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:410
+#: src/gtkblist.c:423
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:411 src/gtkblist.c:442
+#: src/gtkblist.c:425
+msgid "Auto-Join"
+msgstr "自动加入"
+
+#: src/gtkblist.c:428 src/gtkblist.c:474
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkblist.c:412 src/gtkblist.c:443
+#: src/gtkblist.c:430 src/gtkblist.c:476
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:421
+#: src/gtkblist.c:448
 msgid "_Get Info"
 msgstr "获取信息(_G)"
 
-#: src/gtkblist.c:423
+#: src/gtkblist.c:451
 msgid "_IM"
 msgstr "开聊(_I)"
 
-#: src/gtkblist.c:424
+#: src/gtkblist.c:453
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:425
+#: src/gtkblist.c:455
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:740
+#: src/gtkblist.c:780
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:741
+#: src/gtkblist.c:781
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/新即时消息(_I)..."
 
-#: src/gtkblist.c:742
+#: src/gtkblist.c:782
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:743
+#: src/gtkblist.c:783
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/获取用户信息(_U)..."
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:785
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:746
+#: src/gtkblist.c:786
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:747
+#: src/gtkblist.c:787
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:748
+#: src/gtkblist.c:788
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:789
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:791
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:752
+#: src/gtkblist.c:792
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:755
+#: src/gtkblist.c:795
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:756
+#: src/gtkblist.c:796
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:757
+#: src/gtkblist.c:797
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:758
+#: src/gtkblist.c:798
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:760
+#: src/gtkblist.c:800
 msgid "/Tools/A_ccounts"
 msgstr "/工具(T)/账户(_C)"
 
-#: src/gtkblist.c:761
+#: src/gtkblist.c:801
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件传送(_F)..."
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:802
 msgid "/Tools/Preferences"
 msgstr "/工具(T)/首选项"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:803
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:805
 msgid "/Tools/View System _Log"
 msgstr "/工具(T)/查看系统日志(_L)"
 
 #. Help
-#: src/gtkblist.c:768
+#: src/gtkblist.c:808
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:769
+#: src/gtkblist.c:809
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:770
+#: src/gtkblist.c:810
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: src/gtkblist.c:771
+#: src/gtkblist.c:811
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: src/gtkblist.c:805
+#: src/gtkblist.c:845
 #, c-format
 msgid ""
 "\n"
@@ -4482,12 +4802,12 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:864
+#: src/gtkblist.c:907
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:878
+#: src/gtkblist.c:921
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4495,7 +4815,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:879
+#: src/gtkblist.c:922
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4503,7 +4823,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:880
+#: src/gtkblist.c:923
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4511,7 +4831,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:881
+#: src/gtkblist.c:924
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4519,7 +4839,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:882
+#: src/gtkblist.c:925
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4527,7 +4847,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:884
+#: src/gtkblist.c:927
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4535,7 +4855,7 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:885
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -4543,7 +4863,7 @@
 "\n"
 "<b>状态</b>:可怕"
 
-#: src/gtkblist.c:886
+#: src/gtkblist.c:929
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -4551,490 +4871,602 @@
 "\n"
 "<b>状态</b>:混乱"
 
-#: src/gtkblist.c:1181
+#: src/gtkblist.c:1226
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1183
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1187
+#: src/gtkblist.c:1232
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1190
+#: src/gtkblist.c:1235
 msgid "Offline "
 msgstr "离线 "
 
-#: src/gtkblist.c:1346 src/gtkprefs.c:906 src/gtkprefs.c:1508
+#: src/gtkblist.c:1391 src/gtkprefs.c:844 src/gtkprefs.c:1518
 msgid "None"
 msgstr "无"
 
-#: src/gtkblist.c:1347
+#: src/gtkblist.c:1392
 msgid "Alphabetical"
 msgstr "字母序"
 
-#: src/gtkblist.c:1348
+#: src/gtkblist.c:1393
 msgid "By status"
 msgstr "按状态"
 
-#: src/gtkblist.c:1349
+#: src/gtkblist.c:1394
 msgid "By log size"
 msgstr "按日志大小"
 
-#: src/gtkblist.c:1385 src/gtkprefs.c:2257
+#: src/gtkblist.c:1430 src/gtkprefs.c:2271
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: src/gtkblist.c:1409
+#: src/gtkblist.c:1454
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:1412
+#: src/gtkblist.c:1457
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:1415
+#: src/gtkblist.c:1460
 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:1498
+#: src/gtkblist.c:1543
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:1500
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1518 src/gtkconv.c:783
+#: src/gtkblist.c:1563 src/gtkconv.c:1055
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:1524
+#: src/gtkblist.c:1569
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:1533
+#: src/gtkblist.c:1578
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:1541
+#: src/gtkblist.c:1586
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:1549
+#: src/gtkblist.c:1594
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkconv.c:228
+#: src/gtkblist.c:2581
+msgid "No actions available"
+msgstr "没有可用的操作"
+
+#: src/gtkconn.c:57 src/gtkconn.c:237 src/gtkconn.c:254 src/gtkconn.c:363
+#: src/multi.c:91
+msgid "Done."
+msgstr "完成。"
+
+#: src/gtkconn.c:132 src/multi.c:167
+msgid "Signon: "
+msgstr "登入:"
+
+#: src/gtkconn.c:190 src/multi.c:225
+msgid "Signon"
+msgstr "登入"
+
+#: src/gtkconn.c:203 src/multi.c:237
+msgid "Cancel All"
+msgstr "全部取消"
+
+#: src/gtkconn.c:354 src/multi.c:292
+#, c-format
+msgid ""
+"%s\n"
+"%s: %s"
+msgstr ""
+"%s\n"
+"%s:%s"
+
+#: src/gtkconn.c:376 src/multi.c:314
+#, c-format
+msgid "%s was unable to sign on"
+msgstr "%s 无法登入"
+
+#: src/gtkconn.c:378 src/multi.c:316
+msgid "Signon Error"
+msgstr "登入出错"
+
+#: src/gtkconn.c:391 src/multi.c:329
+msgid "Notice"
+msgstr "注意"
+
+#: src/gtkconn.c:405 src/multi.c:343
+#, c-format
+msgid "%s has been signed off"
+msgstr "%s 已经登出"
+
+#: src/gtkconn.c:407 src/multi.c:345
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: src/gtkconv.c:262
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:791
-msgid "Un-Ignore"
-msgstr "取消忽略"
-
-#: src/gtkconv.c:793 src/gtkprefs.c:836
-msgid "Ignore"
-msgstr "忽略"
-
-#. Info button
-#: src/gtkconv.c:802 src/gtkconv.c:2676
-msgid "Info"
-msgstr "信息"
-
-#: src/gtkconv.c:822 src/gtkconv.c:2659 src/gtkconv.c:3790
-#: src/gtkrequest.c:104
-msgid "Remove"
-msgstr "删除"
-
-#: src/gtkconv.c:896
+#: src/gtkconv.c:564
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:924
+#: src/gtkconv.c:592
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:945
+#: src/gtkconv.c:613
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:965
+#: src/gtkconv.c:633
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1986
+#: src/gtkconv.c:1063
+msgid "Un-Ignore"
+msgstr "取消忽略"
+
+#: src/gtkconv.c:1065 src/gtkprefs.c:774
+msgid "Ignore"
+msgstr "忽略"
+
+#. Info button
+#: src/gtkconv.c:1074 src/gtkconv.c:2961
+msgid "Info"
+msgstr "信息"
+
+#: src/gtkconv.c:1094 src/gtkconv.c:2944 src/gtkconv.c:4080
+#: src/gtkrequest.c:174
+msgid "Remove"
+msgstr "删除"
+
+#: src/gtkconv.c:2173
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:1994
+#: src/gtkconv.c:2181
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2096
+#: src/gtkconv.c:2284
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
+#: src/gtkconv.c:2740
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - 保存对话"
+
 #. Conversation menu
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2757
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2550
+#: src/gtkconv.c:2759
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2552
+#: src/gtkconv.c:2761
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2554
+#: src/gtkconv.c:2765
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/对话(C)/添加好友千里眼(_P)..."
+
+#: src/gtkconv.c:2767
+msgid "/Conversation/A_lias..."
+msgstr "/对话(C)/别名(_L)..."
+
+#: src/gtkconv.c:2769
+msgid "/Conversation/_Get Info..."
+msgstr "/对话(C)/获取信息(_G)..."
+
+#: src/gtkconv.c:2771
+msgid "/Conversation/In_vite..."
+msgstr "/对话(C)/邀请(_V)..."
+
+#: src/gtkconv.c:2776
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2778
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2559
+#: src/gtkconv.c:2783
+msgid "/Conversation/_Warn..."
+msgstr "/对话(C)/警告(_W)..."
+
+#: src/gtkconv.c:2785
+msgid "/Conversation/_Block..."
+msgstr "/对话(C)/屏蔽(_B)..."
+
+#: src/gtkconv.c:2787
+msgid "/Conversation/_Add..."
+msgstr "/对话(C)/添加(_A)..."
+
+#: src/gtkconv.c:2789
+msgid "/Conversation/_Remove..."
+msgstr "/对话(C)/删除(_R)..."
+
+#: src/gtkconv.c:2794
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2563
+#: src/gtkconv.c:2798
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2564
+#: src/gtkconv.c:2799
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2565
+#: src/gtkconv.c:2800
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2601
+#: src/gtkconv.c:2840
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2603
+#: src/gtkconv.c:2845
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/对话(C)/添加好友千里眼(P)..."
+
+#: src/gtkconv.c:2849
+msgid "/Conversation/Alias..."
+msgstr "/对话(C)/别名(L)..."
+
+#: src/gtkconv.c:2853
+msgid "/Conversation/Get Info..."
+msgstr "/对话(C)/获取信息(G)..."
+
+#: src/gtkconv.c:2857
+msgid "/Conversation/Invite..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: src/gtkconv.c:2863
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2605
+#: src/gtkconv.c:2867
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2607
+#: src/gtkconv.c:2873
+msgid "/Conversation/Warn..."
+msgstr "/对话(C)/警告(W)..."
+
+#: src/gtkconv.c:2877
+msgid "/Conversation/Block..."
+msgstr "/对话(C)/屏蔽(B)..."
+
+#: src/gtkconv.c:2881
+msgid "/Conversation/Add..."
+msgstr "/对话(C)/添加(A)..."
+
+#: src/gtkconv.c:2885
+msgid "/Conversation/Remove..."
+msgstr "/对话(C)/删除(R)..."
+
+#: src/gtkconv.c:2891
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2609
+#: src/gtkconv.c:2894
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2633 src/gtkconv.c:2635 src/gtkconv.c:2733 src/gtkconv.c:2735
-#: src/gtkconv.c:5336
+#: src/gtkconv.c:2918 src/gtkconv.c:2920 src/gtkconv.c:3018 src/gtkconv.c:3020
+#: src/gtkconv.c:5653
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2656 src/gtkconv.c:3802
+#: src/gtkconv.c:2941 src/gtkconv.c:4098
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2662 src/gtkconv.c:3793
+#: src/gtkconv.c:2947 src/gtkconv.c:4083
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2669
+#: src/gtkconv.c:2954
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2673
+#: src/gtkconv.c:2958
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2680 src/gtkconv.c:3113
+#: src/gtkconv.c:2965 src/gtkconv.c:3398
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:2683
+#: src/gtkconv.c:2968
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:2687
+#: src/gtkconv.c:2972
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:2745 src/gtkconv.c:5339
+#: src/gtkconv.c:3030 src/gtkconv.c:5656
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:2748
+#: src/gtkconv.c:3033
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:2787
+#: src/gtkconv.c:3072
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:2798
+#: src/gtkconv.c:3083
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:2809
+#: src/gtkconv.c:3094
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:3110
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:2837
+#: src/gtkconv.c:3122
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:2849
+#: src/gtkconv.c:3134
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:3151
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:3163
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:3175
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:2905
+#: src/gtkconv.c:3190
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:3201
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:2927
+#: src/gtkconv.c:3212
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:2984
+#: src/gtkconv.c:3269
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3033
+#: src/gtkconv.c:3318
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3090
+#: src/gtkconv.c:3375
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3102
+#: src/gtkconv.c:3387
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3632
+#: src/gtkconv.c:3918
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4271 src/gtkconv.c:4393
+#: src/gtkconv.c:4575 src/gtkconv.c:4697
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:4661
+#: src/gtkconv.c:4971
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:4670
+#: src/gtkconv.c:4980
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:4677
+#: src/gtkconv.c:4987
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:4683
+#: src/gtkconv.c:4993
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkft.c:106
-msgid "Calculating..."
-msgstr "正在计算..."
-
-#: src/gtkft.c:109
-msgid "Unknown."
-msgstr "未知。"
-
-#: src/gtkft.c:146
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:201
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:224
+#: src/gtkft.c:204
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:454
+#: src/gtkft.c:436
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:461
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:468
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:475
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:505
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:506
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:507
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:508
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: src/gtkft.c:509
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:604
+#: src/gtkft.c:586
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:614
+#: src/gtkft.c:596
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:623
+#: src/gtkft.c:605
 msgid "Show download details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:624
+#: src/gtkft.c:606
 msgid "Hide download details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:666
+#: src/gtkft.c:648 src/stock.c:86
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:676
+#: src/gtkft.c:658
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:1028
+#: src/gtkft.c:1013
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
-#: src/gtkft.c:1035
+#: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/gtkft.c:1048
+#: src/gtkft.c:1033
 msgid "That file already exists."
 msgstr "该文件不存在。"
 
-#: src/gtkft.c:1049
+#: src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: src/gtkft.c:1073
+#: src/gtkft.c:1058
 msgid "Gaim - Open..."
 msgstr "Gaim - 打开..."
 
-#: src/gtkft.c:1122
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: src/gtkimhtml.c:346
+#: src/gtkimhtml.c:498
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: src/gtkimhtml.c:353
+#: src/gtkimhtml.c:505
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: src/gtkimhtml.c:1668
+#: src/gtkimhtml.c:1599
 msgid ""
-"Gaim was unable to guess the image type base on the file extension "
-"supplied.  Defaulting to PNG."
+"Unable to guess the image type based on the file extension supplied.  "
+"Defaulting to PNG."
 msgstr "Gaim 无法根据提供的文件扩展名猜测图像类型。按默认值视为 PNG。"
 
-#: src/gtkimhtml.c:1676
+#: src/gtkimhtml.c:1607
 #, c-format
 msgid "Error saving image: %s"
 msgstr "保存图像出错:%s"
 
-#: src/gtkimhtml.c:1685
-msgid "Gaim - Save Image"
-msgstr "Gaim - 保存图像"
-
-#: src/gtkimhtml.c:1707
+#: src/gtkimhtml.c:1616
+msgid "Save Image"
+msgstr "保存图像"
+
+#: src/gtkimhtml.c:1638
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtknotify.c:190
+#: src/gtknotify.c:193
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/gtknotify.c:198
+#: src/gtknotify.c:201
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">来自:</span> %s\n"
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:206
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主题:</span> %s\n"
 
-#: src/gtknotify.c:207
+#: src/gtknotify.c:210
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5045,7 +5477,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:225
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5056,604 +5488,600 @@
 "\n"
 "%s"
 
-#: src/gtkpounce.c:122
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:172
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#: src/gtkpounce.c:345
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s 开始向您打字"
-
-#: src/gtkpounce.c:346
-#, c-format
-msgid "%s has signed on"
-msgstr "%s 已登入"
-
-#: src/gtkpounce.c:347
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s 睡醒了"
-
-#: src/gtkpounce.c:348
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s 回来了"
-
-#: src/gtkpounce.c:349
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s 停止了给您打字"
-
-#: src/gtkpounce.c:350
-#, c-format
-msgid "%s has signed off"
-msgstr "%s 已登出"
-
-#: src/gtkpounce.c:351
-#, c-format
-msgid "%s has become idle"
-msgstr "%s 打起瞌睡"
-
-#: src/gtkpounce.c:352
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 走了。"
-
-#: src/gtkpounce.c:353
-msgid "Unknown pounce event. Please report this!"
-msgstr "未知的千里眼。请报告此错误!"
-
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:494 src/gtkpounce.c:884
+#: src/gtkpounce.c:383 src/gtkpounce.c:787
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:494
+#: src/gtkpounce.c:383
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:512
+#: src/gtkpounce.c:401
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:534
+#: src/gtkpounce.c:426
 msgid "_Buddy Name:"
 msgstr "好友(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:553
+#: src/gtkpounce.c:448
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:561
+#: src/gtkpounce.c:456
 msgid "Sign on"
 msgstr "登入"
 
-#: src/gtkpounce.c:563
+#: src/gtkpounce.c:458
 msgid "Sign off"
 msgstr "登出"
 
-#: src/gtkpounce.c:567
+#: src/gtkpounce.c:462
 msgid "Return from away"
 msgstr "回来"
 
-#: src/gtkpounce.c:571
+#: src/gtkpounce.c:466
 msgid "Return from idle"
 msgstr "睡醒了"
 
-#: src/gtkpounce.c:573
+#: src/gtkpounce.c:468
 msgid "Buddy starts typing"
 msgstr "好友开始打字"
 
-#: src/gtkpounce.c:575
+#: src/gtkpounce.c:470
 msgid "Buddy stops typing"
 msgstr "好友停止打字"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:604
+#: src/gtkpounce.c:499
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:611
+#: src/gtkpounce.c:506
 msgid "Open an IM window"
 msgstr "打开即时消息窗口"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:507
 msgid "Popup notification"
 msgstr "弹出通知"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:508
 msgid "Send a message"
 msgstr "发送消息"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:509
 msgid "Execute a command"
 msgstr "执行命令"
 
-#: src/gtkpounce.c:615
+#: src/gtkpounce.c:510
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: src/gtkpounce.c:619 src/gtkpounce.c:621 src/gtkaccount.c:406
+#: src/gtkpounce.c:514 src/gtkpounce.c:516
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:622 src/gtkprefs.c:2084
+#: src/gtkpounce.c:517 src/gtkprefs.c:2098
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkpounce.c:705
+#: src/gtkpounce.c:600
 msgid "_Save this pounce after activation"
 msgstr "激活后保存此千里眼(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:891
+#: src/gtkpounce.c:794
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkprefs.c:440
+#: src/gtkpounce.c:835
+#, c-format
+msgid "%s has started typing to you"
+msgstr "%s 开始向您打字"
+
+#: src/gtkpounce.c:836
+#, c-format
+msgid "%s has signed on"
+msgstr "%s 已登入"
+
+#: src/gtkpounce.c:837
+#, c-format
+msgid "%s has returned from being idle"
+msgstr "%s 睡醒了"
+
+#: src/gtkpounce.c:838
+#, c-format
+msgid "%s has returned from being away"
+msgstr "%s 回来了"
+
+#: src/gtkpounce.c:839
+#, c-format
+msgid "%s has stopped typing to you"
+msgstr "%s 停止了给您打字"
+
+#: src/gtkpounce.c:840
+#, c-format
+msgid "%s has signed off"
+msgstr "%s 已登出"
+
+#: src/gtkpounce.c:841
+#, c-format
+msgid "%s has become idle"
+msgstr "%s 打起瞌睡"
+
+#: src/gtkpounce.c:842
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 走了。"
+
+#: src/gtkpounce.c:843
+msgid "Unknown pounce event. Please report this!"
+msgstr "未知的千里眼。请报告此错误!"
+
+#: src/gtkprefs.c:378
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/gtkprefs.c:442
+#: src/gtkprefs.c:380
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/gtkprefs.c:623
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/gtkprefs.c:656
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "图标"
 
-#: src/gtkprefs.c:730
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "样式"
 
-#: src/gtkprefs.c:731
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "斜体(_I)"
 
-#: src/gtkprefs.c:735
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/gtkprefs.c:740
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "字体"
 
-#: src/gtkprefs.c:743
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/gtkprefs.c:760
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "颜色"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/gtkprefs.c:824 src/gtkprefs.c:1063 src/gtkprefs.c:1116
+#: src/gtkprefs.c:762 src/gtkprefs.c:996 src/gtkprefs.c:1049
 msgid "Display"
 msgstr "显示"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/gtkprefs.c:837
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/gtkprefs.c:855
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "回车键发送消息(_S)"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/gtkprefs.c:861
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "Esc 键关闭窗口(_E)"
 
-#: src/gtkprefs.c:863
+#: src/gtkprefs.c:801
 msgid "Control-_W closes window"
 msgstr "Ctrl+W 键关闭窗口(_W)"
 
-#: src/gtkprefs.c:866
+#: src/gtkprefs.c:804
 msgid "Insertions"
 msgstr "插入"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:805
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:807
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+数字键插入笑脸(_I)"
 
-#: src/gtkprefs.c:886
+#: src/gtkprefs.c:824
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:833
 msgid "Sorting:"
 msgstr "排序:"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:838
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/gtkprefs.c:901 src/gtkprefs.c:1033 src/gtkprefs.c:1089
+#: src/gtkprefs.c:839 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/gtkprefs.c:903 src/gtkprefs.c:1035 src/gtkprefs.c:1091
+#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures"
 msgstr "图片"
 
-#: src/gtkprefs.c:904 src/gtkprefs.c:1036 src/gtkprefs.c:1092
+#: src/gtkprefs.c:842 src/gtkprefs.c:969 src/gtkprefs.c:1025
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:905 src/gtkprefs.c:1037 src/gtkprefs.c:1093
+#: src/gtkprefs.c:843 src/gtkprefs.c:970 src/gtkprefs.c:1026
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:848
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:851
 msgid "Group Display"
-msgstr "组显示"
+msgstr "分组显示"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:853
 msgid "Show _numbers in groups"
-msgstr "在组旁显示数字(_N)"
-
-#: src/gtkprefs.c:918
+msgstr "在分组旁显示数字(_N)"
+
+#: src/gtkprefs.c:856
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/gtkprefs.c:919 src/gtkprefs.c:1058
+#: src/gtkprefs.c:857 src/gtkprefs.c:991
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/gtkprefs.c:921
+#: src/gtkprefs.c:859
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:862
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:876
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:2258
+#: src/gtkprefs.c:896 src/gtkprefs.c:2272
 msgid "Conversations"
 msgstr "对话"
 
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:900
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:976
+#: src/gtkprefs.c:909
 msgid "Send _URLs as Links"
 msgstr "将 URLs 发送为链接(_U)"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:912
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/gtkprefs.c:982 src/gtkprefs.c:993
+#: src/gtkprefs.c:915 src/gtkprefs.c:926
 msgid "Top"
 msgstr "上"
 
-#: src/gtkprefs.c:984 src/gtkprefs.c:994
+#: src/gtkprefs.c:917 src/gtkprefs.c:927
 msgid "Bottom"
 msgstr "下"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:995
+#: src/gtkprefs.c:919 src/gtkprefs.c:928
 msgid "Left"
 msgstr "左"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:996
+#: src/gtkprefs.c:921 src/gtkprefs.c:929
 msgid "Right"
 msgstr "右"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:924
 msgid "_Tab Placement:"
 msgstr "标签位置(_T):"
 
-#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:935
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:938
 msgid "Show _close button on tabs."
 msgstr "在标签上显示关闭按钮(_C)。"
 
-#: src/gtkprefs.c:1032 src/gtkprefs.c:1088
+#: src/gtkprefs.c:965 src/gtkprefs.c:1021
 msgid "Window"
 msgstr "窗口"
 
-#: src/gtkprefs.c:1042 src/gtkprefs.c:1098
+#: src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/gtkprefs.c:1045 src/gtkprefs.c:1101
+#: src/gtkprefs.c:978 src/gtkprefs.c:1034
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/gtkprefs.c:1048 src/gtkprefs.c:1104
+#: src/gtkprefs.c:981 src/gtkprefs.c:1037
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/gtkprefs.c:1051 src/gtkprefs.c:1107
+#: src/gtkprefs.c:984 src/gtkprefs.c:1040
 msgid "_Raise windows on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:986
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:990
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:993
 msgid "Enable buddy icon a_nimation"
 msgstr "启用好友图标动画(_N)"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:997
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:999
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/gtkprefs.c:1069
+#: src/gtkprefs.c:1002
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/gtkprefs.c:1070
+#: src/gtkprefs.c:1003
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1043
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1044
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1046
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1050
 msgid "_Show people joining in window"
 msgstr "在窗口中显示加入的人(_S)"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1052
 msgid "_Show people leaving in window"
 msgstr "在窗口中显示离开的人(_S)"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1054
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/gtkprefs.c:1140
+#: src/gtkprefs.c:1098
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/gtkprefs.c:1141 src/gtkaccount.c:696
-msgid "Proxy _type:"
-msgstr "代理类型(_T):"
-
-#: src/gtkprefs.c:1143
+#: src/gtkprefs.c:1101
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1107
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/gtkprefs.c:1167
+#: src/gtkprefs.c:1127
 msgid "_Host"
 msgstr "主机(_H)"
 
-#: src/gtkprefs.c:1202
+#: src/gtkprefs.c:1162
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/gtkprefs.c:1219
+#: src/gtkprefs.c:1179
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/gtkprefs.c:1243
+#: src/gtkprefs.c:1235
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr "输入的手动浏览器“%s”无效。超级链接无法工作。"
-
-#: src/gtkprefs.c:1263
+msgstr "手动输入的浏览器“%s”无效。超级链接无法工作。"
+
+#: src/gtkprefs.c:1255
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1256
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1265
+#: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1258
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1267
+#: src/gtkprefs.c:1259
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1268
 msgid "Manual"
 msgstr "手动"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1309
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/gtkprefs.c:1314
-msgid "_Browser"
-msgstr "浏览器(_B)"
-
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1313
+msgid "_Browser:"
+msgstr "浏览器(_B):"
+
+#: src/gtkprefs.c:1323
 msgid "_Manual: "
 msgstr "手动(_M):"
 
-#: src/gtkprefs.c:1346
+#: src/gtkprefs.c:1344
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1345
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1360
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/gtkprefs.c:1363
+#: src/gtkprefs.c:1361
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1363
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/gtkprefs.c:1367
+#: src/gtkprefs.c:1365
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/gtkprefs.c:1370
+#: src/gtkprefs.c:1368
 msgid "System Logs"
 msgstr "系统日志"
 
+#: src/gtkprefs.c:1369
+msgid "Log when buddies _sign on/sign off"
+msgstr "记录好友的登入/登出(_S)"
+
 #: src/gtkprefs.c:1371
-msgid "Log when buddies _sign on/sign off"
-msgstr "记录好友的登入/登出(_S)"
+msgid "Log when buddies become _idle/un-idle"
+msgstr "记录好友的瞌睡(_I)"
 
 #: src/gtkprefs.c:1373
-msgid "Log when buddies become _idle/un-idle"
-msgstr "记录好友的瞌睡(_I)"
+msgid "Log when buddies go away/come _back"
+msgstr "记录好友的离开/回来(_B)"
 
 #: src/gtkprefs.c:1375
-msgid "Log when buddies go away/come _back"
-msgstr "记录好友的离开/回来(_B)"
-
-#: src/gtkprefs.c:1377
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1377
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1420
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1421
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/gtkprefs.c:1416
+#: src/gtkprefs.c:1423
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/gtkprefs.c:1420
+#: src/gtkprefs.c:1427
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1428
 msgid "_Method"
 msgstr "方式(_M)"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1430
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/gtkprefs.c:1425
+#: src/gtkprefs.c:1432
 msgid "Automatic"
 msgstr "自动"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1439
 msgid "Command"
 msgstr "命令"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1449
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5662,67 +6090,67 @@
 "声音命令(_O)\n"
 "(%s 代表文件名)"
 
-#: src/gtkprefs.c:1484
+#: src/gtkprefs.c:1494
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/gtkprefs.c:1486
+#: src/gtkprefs.c:1496
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/gtkprefs.c:1489
+#: src/gtkprefs.c:1499
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/gtkprefs.c:1492
+#: src/gtkprefs.c:1502
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/gtkprefs.c:1495
+#: src/gtkprefs.c:1505
 msgid "_Send auto-response"
 msgstr "发送自动回复(_S)"
 
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1507
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1509
 msgid "Send auto-response in active conversations"
 msgstr "在当前对话中发送自动回复"
 
-#: src/gtkprefs.c:1506
+#: src/gtkprefs.c:1516
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1519
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1522
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1524
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1532
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1533
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1535
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/gtkprefs.c:1532
+#: src/gtkprefs.c:1542
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/gtkprefs.c:1594
+#: src/gtkprefs.c:1604
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5737,7 +6165,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1609
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5752,432 +6180,171 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/gtkprefs.c:1774
+#: src/gtkprefs.c:1786
 msgid "Load"
 msgstr "装入"
 
-#: src/gtkprefs.c:1781
+#: src/gtkprefs.c:1793
 msgid "Name"
 msgstr "名称"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1840
 msgid "Details"
 msgstr "细节"
 
-#: src/gtkprefs.c:1953
+#: src/gtkprefs.c:1965
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/gtkprefs.c:2058
+#: src/gtkprefs.c:2072
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2065
+#: src/gtkprefs.c:2079
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2088 src/gtkaccount.c:410
+#: src/gtkprefs.c:2102
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2092
+#: src/gtkprefs.c:2106
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/gtkprefs.c:2216
+#: src/gtkprefs.c:2230
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2266
 msgid "Interface"
 msgstr "界面"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2267
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2268
 msgid "Fonts"
 msgstr "字体"
 
-#: src/gtkprefs.c:2255
+#: src/gtkprefs.c:2269
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/gtkprefs.c:2256
+#: src/gtkprefs.c:2270
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2273
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/gtkprefs.c:2261
+#: src/gtkprefs.c:2275
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2278
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2280
 msgid "Logging"
 msgstr "日志"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2281
 msgid "Sounds"
 msgstr "声音"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2282
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/gtkprefs.c:2269
+#: src/gtkprefs.c:2283
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2284
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2287
 msgid "Plugins"
 msgstr "插件"
 
-#: src/gtkutils.c:287
+#: src/gtkrequest.c:170
+msgid "Apply"
+msgstr "应用"
+
+#: src/gtksound.c:60
+msgid "Buddy logs in"
+msgstr "好友登入"
+
+#: src/gtksound.c:61
+msgid "Buddy logs out"
+msgstr "好友登出"
+
+#: src/gtksound.c:62
+msgid "Message received"
+msgstr "消息已收到"
+
+#: src/gtksound.c:63
+msgid "Message received begins conversation"
+msgstr "收到的消息开始对话"
+
+#: src/gtksound.c:64
+msgid "Message sent"
+msgstr "消息已送出"
+
+#: src/gtksound.c:65
+msgid "Person enters chat"
+msgstr "有人进入聊天"
+
+#: src/gtksound.c:66
+msgid "Person leaves chat"
+msgstr "有人离开聊天"
+
+#: src/gtksound.c:67
+msgid "You talk in chat"
+msgstr "您在聊天中发言"
+
+#: src/gtksound.c:68
+msgid "Others talk in chat"
+msgstr "别人在聊天中发言"
+
+#: src/gtksound.c:71
+msgid "Someone says your name in chat"
+msgstr "别人在聊天中提到您的名字"
+
+#: src/gtksound.c:150
+#, c-format
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
+
+#: src/gtksound.c:166
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
+
+#: src/gtksound.c:175
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
+
+#: src/gtkutils.c:283
 msgid "Can't save icon file to disk."
 msgstr "无法保存 0 字节的图标文件。"
 
-#: src/gtkutils.c:322
+#: src/gtkutils.c:318
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 保存图标"
 
-#: src/html.c:323
-msgid "g003: Error opening connection.\n"
-msgstr "g003:打开连接出错。\n"
-
-#: src/log.c:35
-msgid "Error in specifying buddy conversation."
-msgstr "指定好友对话出错。"
-
-#: src/log.c:41
-msgid "Unable to find conversation log"
-msgstr "找不到对话日志"
-
-#: src/log.c:128
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 保存对话"
-
-#: src/log.c:169 src/log.c:190 src/log.c:203
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr "无法建立日志目录 %s"
-
-#: src/log.c:257 src/log.c:273
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr "与 %s 的即时消息会话\n"
-
-#: src/log.c:260 src/log.c:276
-#, c-format
-msgid "IM Sessions with %s"
-msgstr "与 %s 的即时消息会话"
-
-#: src/log.c:313
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr "+++ %s (%s) 登入了 @ %s"
-
-#: src/log.c:318
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr "+++ %s (%s) 登出了 @ %s"
-
-#: src/log.c:323
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr "+++ %s (%s) 更改了离开状态 @ %s"
-
-#: src/log.c:328
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr "+++ %s (%s) 回来了 @ %s"
-
-#: src/log.c:333
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr "+++ %s (%s) 睡着了 @ %s"
-
-#: src/log.c:338
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr "+++ %s (%s) 睡醒了 @ %s"
-
-#: src/log.c:343
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr "+++ 程序退出 @ %s"
-
-#: src/log.c:350
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr "%s (%s) 报告 %s (%s) 登入了 @ %s"
-
-#: src/log.c:355
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr "%s (%s) 报告 %s (%s) 登出了 @ %s"
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr "%s (%s) 报告 %s (%s) 离开了 @ %s"
-
-#: src/log.c:365
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr "%s (%s) 报告 %s (%s) 回来了 @ %s"
-
-#: src/log.c:370
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr "%s (%s) 报告 %s (%s) 睡着了 @ %s"
-
-#: src/log.c:376
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr "%s (%s) 报告 %s (%s) 睡醒了 @ %s"
-
-#: src/log.c:388
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr "%s (%s) 报告 %s 登入了 @ %s"
-
-#: src/log.c:393
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr "%s (%s) 报告 %s 登出了 @ %s"
-
-#: src/log.c:398
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr "%s (%s) 报告 %s 离开了 @ %s"
-
-#: src/log.c:403
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr "%s (%s) 报告 %s 回来了 @ %s"
-
-#: src/log.c:408
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr "%s (%s) 报告 %s 睡着了 @ %s"
-
-#: src/log.c:414
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
-
-#: src/main.c:193
-msgid "Please enter your login."
-msgstr "请输入您的登录名。"
-
-#: src/main.c:285
-msgid "<New User>"
-msgstr "<新用户>"
-
-#: src/main.c:327
-msgid "Login"
-msgstr "登入"
-
-#: src/main.c:343
-msgid "Screen Name:"
-msgstr "用户名:"
-
-#: src/main.c:393 src/win32/systray.c:191
-msgid "Sign On"
-msgstr "登入"
-
-#: src/multi.c:91 src/gtkconn.c:217 src/gtkconn.c:229 src/gtkconn.c:329
-msgid "Done."
-msgstr "完成。"
-
-#: src/multi.c:167 src/gtkconn.c:117
-msgid "Signon: "
-msgstr "登入:"
-
-#: src/multi.c:225 src/gtkconn.c:175
-msgid "Signon"
-msgstr "登入"
-
-#: src/multi.c:237 src/gtkconn.c:188
-msgid "Cancel All"
-msgstr "全部取消"
-
-#: src/multi.c:292 src/gtkconn.c:320
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s:%s"
-
-#: src/multi.c:314 src/gtkconn.c:342
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s 无法登入"
-
-#: src/multi.c:316 src/gtkconn.c:344
-msgid "Signon Error"
-msgstr "登入出错"
-
-#: src/multi.c:329 src/gtkconn.c:357
-msgid "Notice"
-msgstr "注意"
-
-#: src/multi.c:343 src/gtkconn.c:371
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 已经登出"
-
-#: src/multi.c:345 src/gtkconn.c:373
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: src/prpl.c:109
-msgid "No actions available"
-msgstr "没有可用的操作"
-
-#: src/prpl.c:395
-#, 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:407
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"您是否想要将他/她添加为您的好友?"
-
-#: src/prpl.c:410
-msgid "Gaim - Information"
-msgstr "Gaim - 信息"
-
-#: src/prpl.c:413
-msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗?"
-
-#: src/prpl.c:457
-msgid ""
-"You do not currently have any protocols available that are able to register "
-"new accounts."
-msgstr "您目前没有可以注册新账户的协议。"
-
-#: src/prpl.c:494
-msgid "Gaim - Registration"
-msgstr "Gaim - 注册"
-
-#: src/prpl.c:507
-msgid "Registration Information"
-msgstr "注册信息"
-
-#: src/prpl.c:521
-msgid "Register"
-msgstr "注册"
-
-#: src/server.c:58
-msgid "Please enter your password"
-msgstr "请输入您的密码"
-
-#: src/server.c:888
-#, c-format
-msgid "(%d messages)"
-msgstr "(%d 条消息)"
-
-#: src/server.c:900
-msgid "(1 message)"
-msgstr "(1 条消息)"
-
-#: src/server.c:1098 src/server.c:1108
-#, c-format
-msgid "%s logged in."
-msgstr "%s 登入了。"
-
-#: src/server.c:1126 src/server.c:1134
-#, c-format
-msgid "%s logged out."
-msgstr "%s 登出了。"
-
-#: src/server.c:1175
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-"%s 刚刚被 %s 警告。\n"
-"您新的警告级别是 %d%%"
-
-#: src/server.c:1178
-msgid "an anonymous person"
-msgstr "无名氏"
-
-#: src/server.c:1268
-#, c-format
-msgid ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
-"%s"
-msgstr ""
-"用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
-"%s"
-
-#: src/server.c:1272
-#, c-format
-msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
-
-#: src/server.c:1278
-msgid "Accept chat invitation?"
-msgstr "接受聊天邀请吗?"
-
-#: src/server.c:1451
-msgid "Gaim - Popup"
-msgstr "Gaim - 弹出窗口"
-
-#: src/server.c:1478
-msgid "More Info"
-msgstr "更多信息"
-
-#: src/stock.c:88
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: src/stock.c:89
-msgid "_Open Mail"
-msgstr "打开邮件(_O)"
-
-#: src/util.c:110 src/util.c:115 src/util.c:120 src/util.c:123
-msgid "day"
-msgid_plural "days"
-msgstr[0] "天"
-
-#: src/util.c:111 src/util.c:115 src/util.c:129 src/util.c:131
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小时"
-
-#: src/util.c:111 src/util.c:120 src/util.c:129 src/util.c:134
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分"
-
 #. full help text
-#: src/util.c:726
+#: src/gtkutils.c:908
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6209,382 +6376,325 @@
 "  -h, --help          显示帮助并退出\n"
 
 #. short message
-#: src/util.c:741
+#: src/gtkutils.c:923
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
 
-#: src/util.c:1037
-msgid "Not connected to AIM"
-msgstr "未连接到 AIM"
-
-#: src/util.c:1046 src/util.c:1085
-msgid "No screenname given."
-msgstr "没有给出用户名。"
-
-#: src/util.c:1122
-msgid "No roomname given."
-msgstr "没有给出聊天室名。"
-
-#: src/util.c:1141
-msgid "Invalid AIM URI"
-msgstr "无效的 AIM URI"
+#: src/html.c:304
+msgid "g003: Error opening connection.\n"
+msgstr "g003:打开连接出错。\n"
+
+#: src/log.c:29
+msgid "Error in specifying buddy conversation."
+msgstr "指定好友对话出错。"
+
+#: src/log.c:35
+msgid "Unable to find conversation log"
+msgstr "找不到对话日志"
+
+#: src/log.c:118 src/log.c:139 src/log.c:152
+#, c-format
+msgid "Unable to make directory %s for logging"
+msgstr "无法建立日志目录 %s"
+
+#: src/log.c:206 src/log.c:222
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr "与 %s 的即时消息会话\n"
+
+#: src/log.c:209 src/log.c:225
+#, c-format
+msgid "IM Sessions with %s"
+msgstr "与 %s 的即时消息会话"
+
+#: src/log.c:269
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr "+++ %s (%s) 登入了 @ %s"
+
+#: src/log.c:274
+#, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr "+++ %s (%s) 登出了 @ %s"
+
+#: src/log.c:279
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr "+++ %s (%s) 更改了离开状态 @ %s"
+
+#: src/log.c:284
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr "+++ %s (%s) 回来了 @ %s"
+
+#: src/log.c:289
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr "+++ %s (%s) 睡着了 @ %s"
+
+#: src/log.c:294
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr "+++ %s (%s) 睡醒了 @ %s"
+
+#: src/log.c:299
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr "+++ 程序退出 @ %s"
+
+#: src/log.c:306
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr "%s (%s) 报告 %s (%s) 登入了 @ %s"
+
+#: src/log.c:311
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr "%s (%s) 报告 %s (%s) 登出了 @ %s"
+
+#: src/log.c:316
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr "%s (%s) 报告 %s (%s) 离开了 @ %s"
+
+#: src/log.c:321
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr "%s (%s) 报告 %s (%s) 回来了 @ %s"
+
+#: src/log.c:326
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr "%s (%s) 报告 %s (%s) 睡着了 @ %s"
+
+#: src/log.c:332
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr "%s (%s) 报告 %s (%s) 睡醒了 @ %s"
+
+#: src/log.c:344
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr "%s (%s) 报告 %s 登入了 @ %s"
+
+#: src/log.c:349
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr "%s (%s) 报告 %s 登出了 @ %s"
+
+#: src/log.c:354
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr "%s (%s) 报告 %s 离开了 @ %s"
+
+#: src/log.c:359
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr "%s (%s) 报告 %s 回来了 @ %s"
+
+#: src/log.c:364
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr "%s (%s) 报告 %s 睡着了 @ %s"
+
+#: src/log.c:370
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
+
+#: src/main.c:234
+msgid "Please enter your login."
+msgstr "请输入您的登录名。"
+
+#: src/main.c:326
+msgid "<New User>"
+msgstr "<新用户>"
+
+#: src/main.c:368
+msgid "Login"
+msgstr "登入"
+
+#: src/main.c:384
+msgid "Screen Name:"
+msgstr "用户名:"
+
+#: src/main.c:434 src/win32/systray.c:197
+msgid "Sign On"
+msgstr "登入"
+
+#: src/prpl.c:292
+#, 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:304
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"您是否想要将他/她添加为您的好友?"
+
+#: src/prpl.c:307
+msgid "Gaim - Information"
+msgstr "Gaim - 信息"
+
+#: src/prpl.c:310
+msgid "Add buddy to your list?"
+msgstr "将用户加为好友吗?"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: src/request.h:821
+msgid "Accept"
+msgstr "接受"
+
+#: src/server.c:57
+msgid "Please enter your password"
+msgstr "请输入您的密码"
+
+#: src/server.c:898
+#, c-format
+msgid "(%d messages)"
+msgstr "(%d 条消息)"
+
+#: src/server.c:910
+msgid "(1 message)"
+msgstr "(1 条消息)"
+
+#: src/server.c:1108 src/server.c:1118
+#, c-format
+msgid "%s logged in."
+msgstr "%s 登入了。"
+
+#: src/server.c:1136 src/server.c:1144
+#, c-format
+msgid "%s logged out."
+msgstr "%s 登出了。"
+
+#: src/server.c:1185
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s 刚刚被 %s 警告。\n"
+"您新的警告级别是 %d%%"
+
+#: src/server.c:1188
+msgid "an anonymous person"
+msgstr "无名氏"
+
+#: src/server.c:1278
+#, c-format
+msgid ""
+"User '%s' invites %s to buddy chat room: '%s'\n"
+"%s"
+msgstr ""
+"用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
+"%s"
+
+#: src/server.c:1282
+#, c-format
+msgid "User '%s' invites %s to buddy chat room: '%s'\n"
+msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
+
+#: src/server.c:1288
+msgid "Accept chat invitation?"
+msgstr "接受聊天邀请吗?"
+
+#: src/server.c:1461
+msgid "Gaim - Popup"
+msgstr "Gaim - 弹出窗口"
+
+#: src/server.c:1488
+msgid "More Info"
+msgstr "更多信息"
+
+#: src/stock.c:84
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/stock.c:85
+msgid "_Open Mail"
+msgstr "打开邮件(_O)"
+
+#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+msgid "day"
+msgid_plural "days"
+msgstr[0] "天"
+
+#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "小时"
+
+#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分"
+
+#: src/util.c:933
+msgid "Calculating..."
+msgstr "正在计算..."
+
+#: src/util.c:936
+msgid "Unknown."
+msgstr "未知。"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:36
+#: src/win32/systray.c:42
 msgid "Gaim Instant Messenger"
 msgstr "Gaim 即时通讯程序"
 
-#: src/win32/systray.c:37
+#: src/win32/systray.c:43
 msgid "Gaim Instant Messenger - Signed off"
 msgstr "Gaim 即时通讯程序 - 已登出"
 
-#: src/win32/systray.c:38
+#: src/win32/systray.c:44
 msgid "Gaim Instant Messenger - Away"
 msgstr "Gaim 即时通讯程序 - 离开"
 
-#: src/win32/systray.c:134
+#: src/win32/systray.c:140
 msgid "New"
 msgstr "新建"
 
-#: src/win32/systray.c:167
+#: src/win32/systray.c:173
 msgid "Set Away Message"
 msgstr "设置离开消息"
 
-#: src/win32/systray.c:176
+#: src/win32/systray.c:182
 msgid "I'm Back"
 msgstr "我回来了"
 
-#: src/win32/systray.c:365
+#: src/win32/systray.c:371
 msgid "Exit"
 msgstr "退出"
 
-#: src/plugin.c:233
+#: src/plugin.c:222
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "插件 %s 未返回任何有效的插件信息"
 
-#: src/plugin.c:238
+#: src/plugin.c:227
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"
 
 #. * Custom away message.
-#: src/prpl.h:174
+#: src/prpl.h:175
 msgid "Custom"
 msgstr "自定义"
 
-#: src/gtkdebug.c:125
+#: src/gtkdebug.c:141
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: src/gtkdebug.c:164
-msgid "Pause"
-msgstr "暂停"
-
-#: src/gtkdebug.c:170
+#: src/gtkdebug.c:184
 msgid "Timestamps"
 msgstr "时间戳"
-
-#. Build the login options frame.
-#: src/gtkaccount.c:218
-msgid "Login Options"
-msgstr "登入选项"
-
-#: src/gtkaccount.c:235
-msgid "Protocol:"
-msgstr "协议:"
-
-#: src/gtkaccount.c:240
-msgid "Screenname:"
-msgstr "用户名:"
-
-#: src/gtkaccount.c:322
-msgid "Remember password"
-msgstr "记住密码"
-
-#. Build the user options frame.
-#: src/gtkaccount.c:376
-msgid "User Options"
-msgstr "用户选项"
-
-#: src/gtkaccount.c:389
-msgid "New mail notifications"
-msgstr "新邮件通知"
-
-#: src/gtkaccount.c:398
-msgid "Buddy icon file:"
-msgstr "好友图标文件:"
-
-#. Build the protocol options frame.
-#: src/gtkaccount.c:469
-#, c-format
-msgid "%s Options"
-msgstr "%s 选项"
-
-#: src/gtkaccount.c:581
-msgid "Register with your server"
-msgstr "注册服务器"
-
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:600
-msgid "Use Global Proxy Settings"
-msgstr "使用全局代理设置"
-
-#. No Proxy
-#: src/gtkaccount.c:607
-msgid "No Proxy"
-msgstr "无代理"
-
-#. SOCKS 4
-#: src/gtkaccount.c:614
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#. SOCKS 5
-#: src/gtkaccount.c:621
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#. HTTP
-#: src/gtkaccount.c:628
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/gtkaccount.c:660
-msgid "you can see the butterflies mating"
-msgstr ""
-
-#: src/gtkaccount.c:664
-msgid "If you look real closely"
-msgstr ""
-
-#: src/gtkaccount.c:680
-msgid "Proxy Options"
-msgstr "代理选项"
-
-#: src/gtkaccount.c:705
-msgid "_Host:"
-msgstr "主机(_H):"
-
-#: src/gtkaccount.c:709
-msgid "_Port:"
-msgstr "端口(_P):"
-
-#: src/gtkaccount.c:717
-msgid "_Username:"
-msgstr "用户名(_U):"
-
-#: src/gtkaccount.c:722
-msgid "Pa_ssword:"
-msgstr "密码(_S):"
-
-#: src/gtkaccount.c:1019
-msgid "Add Account"
-msgstr "添加账户"
-
-#: src/gtkaccount.c:1021
-msgid "Modify Account"
-msgstr "修改账户"
-
-#. Add the disclosure
-#: src/gtkaccount.c:1045
-msgid "Show more options"
-msgstr "显示全部选项"
-
-#: src/gtkaccount.c:1046
-msgid "Show fewer options"
-msgstr "显示主要选项"
-
-#: src/gtkaccount.c:1351
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "您真的想要删除 %s 吗?"
-
-#: src/gtkaccount.c:1355 src/gtkrequest.c:102
-msgid "Delete"
-msgstr "删除"
-
-#: src/gtkaccount.c:1431
-msgid "Screenname"
-msgstr "用户名"
-
-#: src/gtkaccount.c:1472
-msgid "Protocol"
-msgstr "协议"
-
-#: src/gtkrequest.c:100
-msgid "Apply"
-msgstr "应用"
-
-#: src/gtksound.c:75
-msgid "Buddy logs in"
-msgstr "好友登入"
-
-#: src/gtksound.c:76
-msgid "Buddy logs out"
-msgstr "好友登出"
-
-#: src/gtksound.c:77
-msgid "Message received"
-msgstr "消息已收到"
-
-#: src/gtksound.c:78
-msgid "Message received begins conversation"
-msgstr "收到的消息开始对话"
-
-#: src/gtksound.c:79
-msgid "Message sent"
-msgstr "消息已送出"
-
-#: src/gtksound.c:80
-msgid "Person enters chat"
-msgstr "有人进入聊天"
-
-#: src/gtksound.c:81
-msgid "Person leaves chat"
-msgstr "有人离开聊天"
-
-#: src/gtksound.c:82
-msgid "You talk in chat"
-msgstr "您在聊天中发言"
-
-#: src/gtksound.c:83
-msgid "Others talk in chat"
-msgstr "别人在聊天中发言"
-
-#: src/gtksound.c:86
-msgid "Someone says your name in chat"
-msgstr "别人在聊天中提到您的名字"
-
-#: src/gtksound.c:165
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
-
-#: src/gtksound.c:181
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
-
-#: src/gtksound.c:190
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr "无法播放声音,原因是配置无法调用配置的声音命令:%s"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
-#.
-#: src/request.h:237
-msgid "Accept"
-msgstr "接受"
-
-#: src/protocols/trepia/trepia.c:613 src/protocols/trepia/trepia.c:616
-msgid "Local Users"
-msgstr "本地用户"
-
-#: src/protocols/trepia/trepia.c:707
-msgid "Read error"
-msgstr "读取错误"
-
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#: src/protocols/trepia/trepia.c:1018 src/protocols/trepia/trepia.c:1020
-msgid "Trepia Protocol Plugin"
-msgstr "Trepia 协议插件"
-
-#~ msgid "File Transfers..."
-#~ msgstr "文件传送..."
-
-#~ msgid "Accounts..."
-#~ msgstr "账户..."
-
-#~ msgid "Preferences..."
-#~ msgstr "首选项..."
-
-#~ msgid "Unable to Save Preferences"
-#~ msgstr "无法保存首选项"
-
-#~ msgid ""
-#~ "Gaim was unable to save your preferences. Please verify that you have "
-#~ "enough free space."
-#~ msgstr "Gaim 无法保存您的首选项。请检查您是否有足够的剩余空间。"
-
-#~ msgid "Hide buddy _icons"
-#~ msgstr "隐藏好友图标(_I)"
-
-#~ msgid "IM Tabs"
-#~ msgstr "即时消息标签"
-
-#~ msgid ""
-#~ "Show all _instant messages in one tabbed\n"
-#~ "window"
-#~ msgstr "在一个标签式窗口内显示所有即时消息(_I)"
-
-#~ msgid "Chat Tabs"
-#~ msgstr "聊天标签"
-
-#~ msgid "Show all c_hats in one tabbed window"
-#~ msgstr "在一个标签窗口内显示所有聊天(_H)"
-
-#~ msgid "Tabs"
-#~ msgstr "标签"
-
-#~ msgid "Load Buddy Icon"
-#~ msgstr "装入好友图标"
-
-#~ msgid "Auto-Login"
-#~ msgstr "自动登入"
-
-#~ msgid "Proxy _Type"
-#~ msgstr "代理类型(_T)"
-
-#~ msgid "_Login"
-#~ msgstr "登入(_L)"
-
-#~ msgid ""
-#~ "Please enter your password for %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "请输入您作为 %s 的密码。\n"
-#~ "\n"
-
-#~ msgid "_Password"
-#~ msgstr "密码(_P)"
-
-#~ msgid "TOC not found."
-#~ msgstr "TOC 未找到。"
-
-#~ 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 插"
-#~ "件。"
-
-#~ msgid "Protocol not found."
-#~ msgstr "协议未找到。"
-
-#~ 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 ""
-#~ "您无法登入此账户;您没有装入该账户所使用的协议,或者该协议未提供登录功能。"
-
-#~ msgid "Account Editor"
-#~ msgstr "账户编辑器"