changeset 5500:9cc2f0f20d87

[gaim-migrate @ 5899] Wang (fundawang) updated the zh_CN(Simplified Chinese) po committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 23 May 2003 04:24:58 +0000
parents c8afb821df3e
children 36d2c875a822
files po/zh_CN.po
diffstat 1 files changed, 1604 insertions(+), 1554 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Fri May 23 02:44:39 2003 +0000
+++ b/po/zh_CN.po	Fri May 23 04:24:58 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-05-18 22:57+0800\n"
-"PO-Revision-Date: 2003-05-18 22:59+0800\n"
+"POT-Creation-Date: 2003-05-23 09:33+0800\n"
+"PO-Revision-Date: 2003-05-23 09:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:94 src/multi.c:284 src/win32/systray.c:359
+#: plugins/docklet/docklet.c:94 src/multi.c:285 src/win32/systray.c:359
 msgid "Auto-login"
 msgstr "自动登录"
 
@@ -32,11 +32,11 @@
 msgstr "新建..."
 
 #: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1179
-#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3489
-#: src/protocols/oscar/oscar.c:2780 src/protocols/oscar/oscar.c:4456
-#: src/protocols/oscar/oscar.c:5333 src/protocols/oscar/oscar.c:5655
-#: src/gtkblist.c:1510 src/gtkpounce.c:564 src/prefs.c:1091
+#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:3439 src/protocols/jabber/jabber.c:3493
+#: src/protocols/oscar/oscar.c:2799 src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:5362 src/protocols/oscar/oscar.c:5684
+#: src/gtkblist.c:1517 src/gtkpounce.c:566 src/gtkprefs.c:1092
 msgid "Away"
 msgstr "离开"
 
@@ -319,69 +319,69 @@
 msgid "Checks for new local mail."
 msgstr "检查新的本地邮件。"
 
-#: plugins/notify.c:439
+#: plugins/notify.c:442
 msgid "Unable to write to config file"
 msgstr "无法写入配置文件"
 
-#: plugins/notify.c:439
+#: plugins/notify.c:443
 msgid "Notify plugin"
 msgstr "通知插件"
 
-#: plugins/notify.c:569
+#: plugins/notify.c:573
 msgid "Notify For"
 msgstr "提醒"
 
-#: plugins/notify.c:570
+#: plugins/notify.c:574
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: plugins/notify.c:575
+#: plugins/notify.c:579
 msgid "_Chat windows"
 msgstr "聊天窗口(_C)"
 
 #. --------------
-#: plugins/notify.c:581
+#: plugins/notify.c:585
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:584
+#: plugins/notify.c:588
 msgid "Prepend _string into window title (hit enter to save):"
 msgstr "在窗口标题前追加字符串(按回车保存)(_S):"
 
-#: plugins/notify.c:595
+#: plugins/notify.c:599
 msgid "_Quote window title"
 msgstr "引用窗口标题(_Q)"
 
-#: plugins/notify.c:600
+#: plugins/notify.c:604
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:609
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:614
 msgid "_Notify even if conversation is in focus"
 msgstr "即使正处于对话中也通知(_N)"
 
 #. --------------
-#: plugins/notify.c:616
+#: plugins/notify.c:620
 msgid "Notification Removal"
 msgstr "通知删除"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:621
 msgid "Remove when conversation window gains _focus"
 msgstr "对话窗口获得焦点后即删除(_F)"
 
-#: plugins/notify.c:622
+#: plugins/notify.c:626
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
-#: plugins/notify.c:627
+#: plugins/notify.c:631
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:636
 msgid "Appl_y"
 msgstr "应用(_Y)"
 
@@ -392,14 +392,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:695
+#: plugins/notify.c:699
 msgid "Message Notification"
 msgstr "邮件通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:698 plugins/notify.c:700
+#: plugins/notify.c:702 plugins/notify.c:704
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读邮件。"
 
@@ -590,7 +590,7 @@
 msgstr "在即时消息窗口中显示滑块(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/prefs.c:605
+#: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:606
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
@@ -644,7 +644,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 特定的选项。"
 
-#: plugins/perl/perl.c:395
+#: plugins/perl/perl.c:396
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 调用参数不对。请参考 PERL-HOWTO。"
 
@@ -655,13 +655,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1377
+#: plugins/perl/perl.c:1376
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1379 plugins/perl/perl.c:1380
+#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
@@ -685,11 +685,11 @@
 "idle."
 msgstr "好友离开/返回或瞌睡/睡醒时在对话窗口给出通知。"
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1187
-#: src/protocols/msn/msn.c:314 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1190
+#: src/protocols/msn/msn.c:327 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:1269
-#: src/protocols/yahoo/yahoo.c:1348
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1352
 msgid "Available"
 msgstr "可用"
 
@@ -701,11 +701,11 @@
 msgid "Away for friends only"
 msgstr "只对好友离开"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3438
-#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2784
-#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4471
-#: src/protocols/oscar/oscar.c:5660 src/protocols/yahoo/yahoo.c:1086
-#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1358
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2803
+#: src/protocols/oscar/oscar.c:4472 src/protocols/oscar/oscar.c:4499
+#: src/protocols/oscar/oscar.c:5689 src/protocols/yahoo/yahoo.c:1087
+#: src/protocols/yahoo/yahoo.c:1295 src/protocols/yahoo/yahoo.c:1362
 msgid "Invisible"
 msgstr "隐身"
 
@@ -803,97 +803,97 @@
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "指定的 Gadu-Gadu UIN 无效"
 
-#: src/protocols/gg/gg.c:591
+#: src/protocols/gg/gg.c:592
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您试图向无效的 Gadu-Gadu UIN 发送消息。"
 
-#: src/protocols/gg/gg.c:654
+#: src/protocols/gg/gg.c:655
 msgid "Couldn't get search results"
 msgstr "无法获取搜索结果"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:660
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜索引擎"
 
-#: src/protocols/gg/gg.c:684
+#: src/protocols/gg/gg.c:685
 msgid "Active"
 msgstr "活跃"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1031
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1033
 msgid "Yes"
 msgstr "是"
 
-#: src/protocols/gg/gg.c:685 src/protocols/oscar/oscar.c:4955 src/gtkft.c:1032
+#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1034
 msgid "No"
 msgstr "否"
 
-#: src/protocols/gg/gg.c:689
+#: src/protocols/gg/gg.c:690
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:694
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:699
 msgid "Second Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:703
 msgid "Nick"
 msgstr "昵称"
 
-#: src/protocols/gg/gg.c:709 src/protocols/gg/gg.c:712
+#: src/protocols/gg/gg.c:710 src/protocols/gg/gg.c:713
 msgid "Birth year"
 msgstr "出生年份"
 
-#: src/protocols/gg/gg.c:718 src/protocols/gg/gg.c:720
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:721
+#: src/protocols/gg/gg.c:723
 msgid "Sex"
 msgstr "性别"
 
 #. Line 5
-#: src/protocols/gg/gg.c:726 src/dialogs.c:2087 src/dialogs.c:2724
+#: src/protocols/gg/gg.c:727 src/dialogs.c:2028 src/dialogs.c:2667
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:760
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 服务器没有存储好友列表。"
 
-#: src/protocols/gg/gg.c:764
+#: src/protocols/gg/gg.c:768
 msgid "Couldn't Import Buddy List from Server"
 msgstr "无法从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:829
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "好友列表已经成功传送到 Gadu-Gadu 服务器了"
 
-#: src/protocols/gg/gg.c:829
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "无法将好友列表传送到 Gadu-Gadu 服务器"
 
-#: src/protocols/gg/gg.c:835
+#: src/protocols/gg/gg.c:844
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "好友列表已经成功从 Gadu-Gadu 服务器删除"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:851
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "无法从 Gadu-Gadu 服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:859
 msgid "Password changed successfully"
 msgstr "密码成功更改"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:865
 msgid "Password couldn't be changed"
 msgstr "密码无法更改"
 
-#: src/protocols/gg/gg.c:962
+#: src/protocols/gg/gg.c:977
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "与 Gadu-Gadu 服务器通讯出错"
 
-#: src/protocols/gg/gg.c:963
+#: src/protocols/gg/gg.c:978
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -901,77 +901,77 @@
 "Gaim 无法完成您的请求,原因是与 Gadu-Gadu HTTP 服务器通讯出现问题。请稍后再试"
 "一次。"
 
-#: src/protocols/gg/gg.c:990
+#: src/protocols/gg/gg.c:1006
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "无法导入 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:991
+#: src/protocols/gg/gg.c:1007
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 无法连接到 Gadu-Gadu 好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1059
+#: src/protocols/gg/gg.c:1076
 msgid "Couldn't export buddy list"
 msgstr "无法导出好友列表"
 
-#: src/protocols/gg/gg.c:1060 src/protocols/gg/gg.c:1082
+#: src/protocols/gg/gg.c:1077 src/protocols/gg/gg.c:1100
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 无法连接到好友列表服务器。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1081
+#: src/protocols/gg/gg.c:1099
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "无法删除 Gadu-Gadu 好友列表"
 
-#: src/protocols/gg/gg.c:1129
+#: src/protocols/gg/gg.c:1148
 msgid "Unable to access directory"
 msgstr "无法访问目录"
 
-#: src/protocols/gg/gg.c:1130
+#: src/protocols/gg/gg.c:1149
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim 无法搜索目录,原因是无法与目录服务器连接。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1162
+#: src/protocols/gg/gg.c:1182
 msgid "Unable to change Gadu-Gadu password"
 msgstr "无法更改 Gadu-Gadu 密码"
 
-#: src/protocols/gg/gg.c:1163
+#: src/protocols/gg/gg.c:1183
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim 无法更改您的密码,原因是与 Gadu-Gadu 服务器连接出错。请稍后再试一次。"
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1199
 msgid "Directory Search"
 msgstr "目录搜索"
 
-#: src/protocols/gg/gg.c:1185 src/protocols/jabber/jabber.c:4324
-#: src/protocols/oscar/oscar.c:5846 src/protocols/toc/toc.c:1449
-#: src/dialogs.c:2194 src/dialogs.c:2203
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:4328
+#: src/protocols/oscar/oscar.c:5882 src/protocols/toc/toc.c:1453
+#: src/dialogs.c:2137 src/dialogs.c:2146
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/protocols/gg/gg.c:1193
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "从服务器导入好友列表"
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "将好友列表导出到服务器"
 
-#: src/protocols/gg/gg.c:1205
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "从服务器删除好友列表"
 
-#: src/protocols/gg/gg.c:1237
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "无法访问用户配置文件。"
 
-#: src/protocols/gg/gg.c:1238
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -988,7 +988,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1349 src/protocols/gg/gg.c:1351
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
@@ -996,21 +996,26 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 与 ICQ 服务器通讯错误。"
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2629
-#: src/dialogs.c:2491 src/gtkconv.c:806 src/gtkconv.c:2645 src/gtkconv.c:3791
-#: src/prpl.c:706
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2648
+#: src/dialogs.c:2434 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3790
+#: src/prpl.c:632
 msgid "Add"
 msgstr "添加"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1430
-#: src/protocols/oscar/oscar.c:2387 src/protocols/oscar/oscar.c:2450
-#: src/protocols/oscar/oscar.c:5534 src/protocols/toc/toc.c:1979
-#: src/buddy_chat.c:307 src/dialogs.c:467 src/dialogs.c:474 src/dialogs.c:482
-#: src/dialogs.c:2144 src/dialogs.c:2255 src/dialogs.c:2315 src/dialogs.c:2480
-#: src/dialogs.c:2666 src/dialogs.c:2815 src/dialogs.c:3460 src/dialogs.c:3952
-#: src/dialogs.c:4430 src/dialogs.c:5003 src/gtkft.c:1110 src/multi.c:1507
-#: src/multi.c:1871 src/prpl.c:250 src/prpl.c:706 src/server.c:1237
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1118
+#: src/protocols/irc/irc.c:1440 src/protocols/msn/msn.c:172
+#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:2433 src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:5767 src/protocols/oscar/oscar.c:5815
+#: src/protocols/toc/toc.c:1991 src/protocols/yahoo/yahoo.c:1205
+#: src/buddy_chat.c:309 src/dialogs.c:468 src/dialogs.c:475 src/dialogs.c:483
+#: src/dialogs.c:2085 src/dialogs.c:2198 src/dialogs.c:2258 src/dialogs.c:2423
+#: src/dialogs.c:2609 src/dialogs.c:2758 src/dialogs.c:3406 src/dialogs.c:3898
+#: src/dialogs.c:4376 src/dialogs.c:4949 src/gtkft.c:1112 src/multi.c:1547
+#: src/multi.c:1911 src/prpl.c:632 src/server.c:1239
 msgid "Cancel"
 msgstr "取消"
 
@@ -1019,16 +1024,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:1715
-#: src/protocols/msn/notification.c:374 src/protocols/msn/notification.c:649
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:444 src/protocols/msn/notification.c:719
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
 msgid "Authorize"
 msgstr "同意"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1715
-#: src/protocols/msn/notification.c:375 src/protocols/msn/notification.c:650
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
-#: src/dialogs.c:2479
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
+#: src/protocols/msn/notification.c:445 src/protocols/msn/notification.c:720
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
+#: src/dialogs.c:2422
 msgid "Deny"
 msgstr "拒绝"
 
@@ -1036,11 +1041,11 @@
 msgid "Send message through server"
 msgstr "通过服务器中转消息"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2333
-#: src/protocols/jabber/jabber.c:2368 src/protocols/jabber/jabber.c:4241
-#: src/protocols/jabber/jabber.c:4288 src/protocols/msn/dispatch.c:165
-#: src/protocols/msn/msn.c:429 src/protocols/msn/notification.c:1238
-#: src/protocols/napster/napster.c:512
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2336
+#: src/protocols/jabber/jabber.c:2371 src/protocols/jabber/jabber.c:4245
+#: src/protocols/jabber/jabber.c:4292 src/protocols/msn/dispatch.c:165
+#: src/protocols/msn/msn.c:442 src/protocols/msn/notification.c:1279
+#: src/protocols/napster/napster.c:515
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -1048,7 +1053,7 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3858
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3881
 msgid "Nick:"
 msgstr "昵称:"
 
@@ -1062,12 +1067,12 @@
 "the Account Editor)"
 msgstr "(转换此消息出错。请检查账户编辑器中的“编码”选项)"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2613
+#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2623
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "与 %s 的二人世界已关闭"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2622
+#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2632
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "与 %s 的二人世界已建立"
@@ -1076,7 +1081,7 @@
 msgid "No topic is set"
 msgstr "没有设置话题"
 
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1752
+#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1762
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 已经将话题改为:%s</B>"
@@ -1095,7 +1100,7 @@
 msgstr "服务器"
 
 #: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1644
+#: src/protocols/irc/irc.c:1654
 msgid "IRC Operator"
 msgstr "IRC 管理者"
 
@@ -1124,8 +1129,8 @@
 msgstr "没有这样的昵称/频道"
 
 #: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
-#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1110
-#: src/protocols/irc/irc.c:1459 src/protocols/irc/irc.c:1602
+#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1111
+#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:1612
 msgid "IRC Error"
 msgstr "IRC 出错"
 
@@ -1146,96 +1151,107 @@
 msgid "You're not an IRC operator!"
 msgstr "您不是 IRC 管理员!"
 
-#: src/protocols/irc/irc.c:1113
+#: src/protocols/irc/irc.c:1114
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "该昵称已经被其他人使用了。请输入新昵称"
 
-#: src/protocols/irc/irc.c:1393 src/protocols/irc/irc.c:1399
-#: src/protocols/irc/irc.c:1405 src/protocols/irc/irc.c:1419
+#. Build OK Button
+#: src/protocols/irc/irc.c:1117 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/oscar/oscar.c:2432
+#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:5766
+#: src/protocols/oscar/oscar.c:5814 src/protocols/yahoo/yahoo.c:1204
+#: src/dialogs.c:2194 src/dialogs.c:2326 src/dialogs.c:2608 src/dialogs.c:2754
+#: src/dialogs.c:3891 src/dialogs.c:4370
+msgid "OK"
+msgstr "确定"
+
+#: src/protocols/irc/irc.c:1403 src/protocols/irc/irc.c:1409
+#: src/protocols/irc/irc.c:1415 src/protocols/irc/irc.c:1429
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 信息"
 
-#: src/protocols/irc/irc.c:1429
+#: src/protocols/irc/irc.c:1439
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s 想要建立二人世界"
 
-#: src/protocols/irc/irc.c:1430
+#: src/protocols/irc/irc.c:1440
 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:1430 src/protocols/oscar/oscar.c:2387
-#: src/protocols/oscar/oscar.c:5534
+#: src/protocols/irc/irc.c:1440 src/protocols/oscar/oscar.c:2396
+#: src/protocols/oscar/oscar.c:5563
 msgid "Connect"
 msgstr "连接"
 
-#: src/protocols/irc/irc.c:1456
+#: src/protocols/irc/irc.c:1466
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "收到了 %s 发出的无效文件发送请求。"
 
-#: src/protocols/irc/irc.c:1537 src/protocols/msn/error.c:132
-#: src/protocols/msn/notification.c:216 src/protocols/msn/notification.c:659
+#: src/protocols/irc/irc.c:1547 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:276 src/protocols/msn/notification.c:731
 msgid "Unable to write"
 msgstr "无法写入"
 
-#: src/protocols/irc/irc.c:1600
+#: src/protocols/irc/irc.c:1610
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "您已经被踢出了 %s: %s"
 
-#: src/protocols/irc/irc.c:1605
+#: src/protocols/irc/irc.c:1615
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "被 %s 踢出:%s"
 
-#: src/protocols/irc/irc.c:1661 src/protocols/irc/irc.c:2923
+#: src/protocols/irc/irc.c:1671 src/protocols/irc/irc.c:2933
 msgid "CTCP ClientInfo"
 msgstr "CTCP 客户信息"
 
-#: src/protocols/irc/irc.c:1667 src/protocols/irc/irc.c:2929
+#: src/protocols/irc/irc.c:1677 src/protocols/irc/irc.c:2939
 msgid "CTCP UserInfo"
 msgstr "CTCP 用户信息"
 
-#: src/protocols/irc/irc.c:1673 src/protocols/irc/irc.c:2935
+#: src/protocols/irc/irc.c:1683 src/protocols/irc/irc.c:2945
 msgid "CTCP Version"
 msgstr "CTCP 版本"
 
-#: src/protocols/irc/irc.c:1701 src/protocols/irc/irc.c:2941
+#: src/protocols/irc/irc.c:1711 src/protocols/irc/irc.c:2951
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1954 src/protocols/oscar/oscar.c:693
+#: src/protocols/irc/irc.c:1964 src/protocols/oscar/oscar.c:695
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "登录名:%s"
 
-#: src/protocols/irc/irc.c:2210
+#: src/protocols/irc/irc.c:2220
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s 的话题是 %s"
 
-#: src/protocols/irc/irc.c:2306
+#: src/protocols/irc/irc.c:2316
 #, c-format
 msgid "You have left %s"
 msgstr "您已经离开了 %s"
 
-#: src/protocols/irc/irc.c:2307
+#: src/protocols/irc/irc.c:2317
 msgid "IRC Part"
 msgstr "IRC 部分"
 
-#: src/protocols/irc/irc.c:2362
+#: src/protocols/irc/irc.c:2372
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>正在请求二人世界</I>"
 
-#: src/protocols/irc/irc.c:2379
+#: src/protocols/irc/irc.c:2389
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>管理员命令:<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2384
+#: src/protocols/irc/irc.c:2394
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1243,11 +1259,11 @@
 "<B>CTCP 命令:<BR>CLIENTINFO <昵称><BR>USERINFO <昵称><BR>VERSION <昵称"
 "><BR>PING <昵称></B><BR>"
 
-#: src/protocols/irc/irc.c:2392
+#: src/protocols/irc/irc.c:2402
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>二人世界命令:<BR>CHAT <昵称></B>"
 
-#: src/protocols/irc/irc.c:2397
+#: src/protocols/irc/irc.c:2407
 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 "
@@ -1259,19 +1275,19 @@
 "入 /HELP OPER 可查看管理员命令<BR>输入 /HELP CTCP 可查看 CTCP 命令<BR>输入 /"
 "HELP DCC 可查看二人世界的命令"
 
-#: src/protocols/irc/irc.c:2420
+#: src/protocols/irc/irc.c:2430
 msgid "<B>Unknown command</B>"
 msgstr "<B>未知命令</B>"
 
-#: src/protocols/irc/irc.c:2480
+#: src/protocols/irc/irc.c:2490
 msgid "Channel:"
 msgstr "频道:"
 
-#: src/protocols/irc/irc.c:2485 src/main.c:346 src/multi.c:773
+#: src/protocols/irc/irc.c:2495 src/main.c:350 src/multi.c:809
 msgid "Password:"
 msgstr "密码:"
 
-#: src/protocols/irc/irc.c:2910
+#: src/protocols/irc/irc.c:2920
 msgid "DCC Chat"
 msgstr "二人世界"
 
@@ -1285,307 +1301,311 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3016 src/protocols/irc/irc.c:3018
+#: src/protocols/irc/irc.c:3026 src/protocols/irc/irc.c:3028
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
-#: src/protocols/irc/irc.c:3038 src/protocols/jabber/jabber.c:2954
-#: src/protocols/jabber/jabber.c:4421 src/protocols/napster/napster.c:657
+#: src/protocols/irc/irc.c:3048 src/protocols/jabber/jabber.c:2958
+#: src/protocols/jabber/jabber.c:4425 src/protocols/napster/napster.c:660
 msgid "Server:"
 msgstr "服务器:"
 
-#: src/protocols/irc/irc.c:3043 src/protocols/jabber/jabber.c:4432
-#: src/protocols/msn/msn.c:1208 src/protocols/napster/napster.c:663
-#: src/multi.c:1099
+#: src/protocols/irc/irc.c:3053 src/protocols/jabber/jabber.c:4436
+#: src/protocols/msn/msn.c:1221 src/protocols/napster/napster.c:666
+#: src/multi.c:1135
 msgid "Port:"
 msgstr "端口:"
 
-#: src/protocols/irc/irc.c:3049
+#: src/protocols/irc/irc.c:3059
 msgid "Encoding:"
 msgstr "编码:"
 
-#: src/protocols/jabber/jabber.c:989
+#: src/protocols/jabber/jabber.c:990
 msgid "Unable to change password."
 msgstr "无法更改密码。"
 
-#: src/protocols/jabber/jabber.c:990
+#: src/protocols/jabber/jabber.c:991
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "您输入的旧密码不正确。您的密码未被更改。"
 
-#: src/protocols/jabber/jabber.c:995
+#: src/protocols/jabber/jabber.c:997
 msgid "Unable to change password"
 msgstr "无法更改密码"
 
-#: src/protocols/jabber/jabber.c:996
+#: src/protocols/jabber/jabber.c:998
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "您输入的新密码与您目前的密码相同。您的密码仍然保持原样。"
 
-#: src/protocols/jabber/jabber.c:1172 src/blist.c:712 src/gtkpounce.c:296
+#: src/protocols/jabber/jabber.c:1175 src/blist.c:714 src/gtkpounce.c:298
 msgid "Unknown"
 msgstr "未知"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1181 src/protocols/jabber/jabber.c:3434
-#: src/protocols/jabber/jabber.c:3485
+#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3438
+#: src/protocols/jabber/jabber.c:3489
 msgid "Chatty"
 msgstr "唠叨"
 
-#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3436
-#: src/protocols/jabber/jabber.c:3493
+#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3440
+#: src/protocols/jabber/jabber.c:3497
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3497 src/protocols/oscar/oscar.c:2774
-#: src/protocols/oscar/oscar.c:4459 src/protocols/oscar/oscar.c:5656
+#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3441
+#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2793
+#: src/protocols/oscar/oscar.c:4487 src/protocols/oscar/oscar.c:5685
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: src/protocols/jabber/jabber.c:1424
+#: src/protocols/jabber/jabber.c:1427
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 错误 %s"
 
-#: src/protocols/jabber/jabber.c:1531
+#: src/protocols/jabber/jabber.c:1534
 #, c-format
 msgid "Error %s: %s"
 msgstr "错误 %s:%s"
 
-#: src/protocols/jabber/jabber.c:1534
+#: src/protocols/jabber/jabber.c:1537
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: src/protocols/jabber/jabber.c:1710
+#: src/protocols/jabber/jabber.c:1713
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "用户 %s 想要将您添加为好友。"
 
-#: src/protocols/jabber/jabber.c:1735
+#: src/protocols/jabber/jabber.c:1738
 #, 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:1738
+#: src/protocols/jabber/jabber.c:1741
 msgid "No such user."
 msgstr "没有这样的用户。"
 
-#: src/protocols/jabber/jabber.c:1829 src/protocols/msn/notification.c:549
-#: src/protocols/msn/notification.c:705 src/protocols/msn/notification.c:706
-#: src/blist.c:437 src/dialogs.c:960
+#: src/protocols/jabber/jabber.c:1832 src/protocols/msn/notification.c:76
+#: src/protocols/msn/notification.c:77 src/protocols/msn/notification.c:619
+#: src/blist.c:438 src/dialogs.c:901
 msgid "Buddies"
 msgstr "好友"
 
-#: src/protocols/jabber/jabber.c:1902
+#: src/protocols/jabber/jabber.c:1905
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: src/protocols/jabber/jabber.c:1936
+#: src/protocols/jabber/jabber.c:1939
 msgid "Unknown login error"
 msgstr "未知的登录错误"
 
-#: src/protocols/jabber/jabber.c:2286
+#: src/protocols/jabber/jabber.c:2289
 msgid "Password successfully changed."
 msgstr "密码更改成功。"
 
-#: src/protocols/jabber/jabber.c:2331 src/protocols/jabber/jabber.c:4239
+#: src/protocols/jabber/jabber.c:2334 src/protocols/jabber/jabber.c:4243
 msgid "Connection lost"
 msgstr "连接已丢失"
 
-#: src/protocols/jabber/jabber.c:2339
+#: src/protocols/jabber/jabber.c:2342
 msgid "Connected"
 msgstr "已连接"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:2345
 msgid "Requesting Authentication Method"
 msgstr "正在请求认证方法"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2362 src/protocols/msn/dispatch.c:170
-#: src/protocols/msn/msn.c:423 src/protocols/napster/napster.c:504
-#: src/protocols/yahoo/yahoo.c:987
+#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:170
+#: src/protocols/msn/msn.c:436 src/protocols/napster/napster.c:507
+#: src/protocols/yahoo/yahoo.c:988
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/protocols/jabber/jabber.c:2688
+#: src/protocols/jabber/jabber.c:2691
 #, 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:2690
+#: src/protocols/jabber/jabber.c:2693
+msgid "Unable to add buddy."
+msgstr "无法添加好友。"
+
+#: src/protocols/jabber/jabber.c:2694
 msgid "Jabber Error"
 msgstr "Jabber 错误"
 
-#: src/protocols/jabber/jabber.c:2949
+#: src/protocols/jabber/jabber.c:2953
 msgid "Room:"
 msgstr "房间:"
 
-#: src/protocols/jabber/jabber.c:2960
+#: src/protocols/jabber/jabber.c:2964
 msgid "Handle:"
 msgstr "门把手:"
 
-#: src/protocols/jabber/jabber.c:2990
+#: src/protocols/jabber/jabber.c:2994
 msgid "Unable to join chat"
 msgstr "无法加入聊天"
 
-#: src/protocols/jabber/jabber.c:3226 src/protocols/jabber/jabber.c:3277
-#: src/protocols/jabber/jabber.c:3702
+#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
+#: src/protocols/jabber/jabber.c:3706
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3227
+#: src/protocols/jabber/jabber.c:3231
 msgid "Error"
 msgstr "出错"
 
-#: src/protocols/jabber/jabber.c:3278 src/protocols/jabber/jabber.c:3337
-#: src/protocols/jabber/jabber.c:3348 src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3732
 msgid "Status"
 msgstr "状态"
 
-#: src/protocols/jabber/jabber.c:3348 src/protocols/jabber/jabber.c:3370
-#: src/protocols/oscar/oscar.c:5337
+#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
+#: src/protocols/oscar/oscar.c:5366
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: src/protocols/jabber/jabber.c:3383
+#: src/protocols/jabber/jabber.c:3387
 msgid "View Error Msg"
 msgstr "查看错误消息"
 
-#: src/protocols/jabber/jabber.c:3395 src/gtkconv.c:793
+#: src/protocols/jabber/jabber.c:3399 src/gtkconv.c:794
 msgid "Get Away Msg"
 msgstr "获得离开消息"
 
-#: src/protocols/jabber/jabber.c:3402
+#: src/protocols/jabber/jabber.c:3406
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: src/protocols/jabber/jabber.c:3405
+#: src/protocols/jabber/jabber.c:3409
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#: src/protocols/jabber/jabber.c:3412
+#: src/protocols/jabber/jabber.c:3416
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: src/protocols/jabber/jabber.c:3420
+#: src/protocols/jabber/jabber.c:3424
 msgid "Re-request authorization"
 msgstr "重新请求认证"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3483
-#: src/protocols/oscar/oscar.c:2786 src/protocols/oscar/oscar.c:4454
-#: src/protocols/oscar/oscar.c:5654 src/protocols/yahoo/yahoo.c:1090
-#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:872
-#: src/multi.c:274
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3487
+#: src/protocols/oscar/oscar.c:2805 src/protocols/oscar/oscar.c:4482
+#: src/protocols/oscar/oscar.c:5683 src/protocols/yahoo/yahoo.c:1091
+#: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
+#: src/multi.c:275
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:3623
+#: src/protocols/jabber/jabber.c:3627
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3624
+#: src/protocols/jabber/jabber.c:3628
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3625
+#: src/protocols/jabber/jabber.c:3629
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3626
+#: src/protocols/jabber/jabber.c:3630
 msgid "Nickname"
 msgstr "昵称"
 
-#: src/protocols/jabber/jabber.c:3627 src/dialogs.c:2936
+#: src/protocols/jabber/jabber.c:3631 src/dialogs.c:2879
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/jabber.c:3632
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3633
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: src/protocols/jabber/jabber.c:3630
+#: src/protocols/jabber/jabber.c:3634
 msgid "Locality"
 msgstr "地区"
 
-#: src/protocols/jabber/jabber.c:3631
+#: src/protocols/jabber/jabber.c:3635
 msgid "Region"
 msgstr "区域"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/jabber.c:3636
 msgid "Postal Code"
 msgstr "邮政编码"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2109 src/dialogs.c:2742
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2050 src/dialogs.c:2685
 msgid "Country"
 msgstr "国家"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3638
 msgid "Telephone"
 msgstr "电话号码"
 
-#: src/protocols/jabber/jabber.c:3635 src/dialogs.c:2800
+#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2743
 msgid "Email"
 msgstr "电子邮件"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3640
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3641
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3642
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3639
+#: src/protocols/jabber/jabber.c:3643
 msgid "Role"
 msgstr "职务"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/jabber.c:3644
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:3641 src/dialogs.c:2946 src/prefs.c:428
-#: src/prefs.c:1403
+#: src/protocols/jabber/jabber.c:3645 src/dialogs.c:2889 src/gtkprefs.c:429
+#: src/gtkprefs.c:1404
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3666
+#: src/protocols/jabber/jabber.c:3670
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息"
 
-#: src/protocols/jabber/jabber.c:3667
+#: src/protocols/jabber/jabber.c:3671
 msgid "User Identity"
 msgstr "用户标识"
 
-#: src/protocols/jabber/jabber.c:4093
+#: src/protocols/jabber/jabber.c:4097
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 编辑 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4168
+#: src/protocols/jabber/jabber.c:4172
 msgid "Server Registration successful!"
 msgstr "服务器注册成功!"
 
-#: src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/jabber.c:4199
 msgid "Unknown registration error"
 msgstr "未知的注册错误"
 
-#: src/protocols/jabber/jabber.c:4310 src/protocols/oscar/oscar.c:5840
-#: src/protocols/toc/toc.c:1437 src/dialogs.c:2279
+#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5876
+#: src/protocols/toc/toc.c:1441 src/dialogs.c:2222
 msgid "Set User Info"
 msgstr "设置用户信息"
 
@@ -1599,19 +1619,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4399 src/protocols/jabber/jabber.c:4401
+#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 协议插件"
 
-#: src/protocols/jabber/jabber.c:4427
+#: src/protocols/jabber/jabber.c:4431
 msgid "Resource:"
 msgstr "资源:"
 
-#: src/protocols/jabber/jabber.c:4438
+#: src/protocols/jabber/jabber.c:4442
 msgid "Connect Server:"
 msgstr "连接服务器:"
 
-#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:159
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:217
 msgid "Protocol not supported"
 msgstr "协议不支持"
 
@@ -1619,7 +1639,7 @@
 msgid "Unable to request INF\n"
 msgstr "无法请求 INF\n"
 
-#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:183
+#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:241
 msgid "Unable to login using MD5"
 msgstr "无法使用 MD5 登入"
 
@@ -1627,7 +1647,7 @@
 msgid "Unable to send USR\n"
 msgstr "无法发送 USR\n"
 
-#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:198
+#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:256
 msgid "Requesting to send password"
 msgstr "正在请求发送密码"
 
@@ -1643,326 +1663,338 @@
 msgid "Unable to parse message."
 msgstr "无法处理消息。"
 
-#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:330
-#: src/protocols/msn/notification.c:1248
+#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:390
+#: src/protocols/msn/notification.c:1289
 msgid "Unable to write to server"
 msgstr "无法写入服务器。"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1255
+#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1296
 msgid "Syncing with server"
 msgstr "正在与服务器同步"
 
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1268
+#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1309
 msgid "Error reading from server"
 msgstr "从服务器读取时出错"
 
-#: src/protocols/msn/error.c:32
+#: src/protocols/msn/error.c:33
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "语法错误(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:37
 msgid "Invalid Parameter (probably a Gaim bug)"
 msgstr "参数无效(可能是 Gaim 的 bug)"
 
-#: src/protocols/msn/error.c:39
+#: src/protocols/msn/error.c:40
 msgid "Invalid User"
 msgstr "用户无效"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
 msgstr "缺少全称域名"
 
-#: src/protocols/msn/error.c:46
+#: src/protocols/msn/error.c:47
 msgid "Already Login"
 msgstr "已登入"
 
-#: src/protocols/msn/error.c:49
+#: src/protocols/msn/error.c:50
 msgid "Invalid Username"
 msgstr "用户名无效"
 
-#: src/protocols/msn/error.c:52
+#: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
 msgstr "友好的名称无效"
 
-#: src/protocols/msn/error.c:55
+#: src/protocols/msn/error.c:56
 msgid "List Full"
 msgstr "列表满"
 
-#: src/protocols/msn/error.c:58
+#: src/protocols/msn/error.c:59
 msgid "Already there"
 msgstr "已列出"
 
-#: src/protocols/msn/error.c:61
+#: src/protocols/msn/error.c:62
 msgid "Not on list"
 msgstr "未列出"
 
-#: src/protocols/msn/error.c:64
+#: src/protocols/msn/error.c:65
 msgid "User is offline"
 msgstr "用户离线"
 
-#: src/protocols/msn/error.c:67
+#: src/protocols/msn/error.c:68
 msgid "Already in the mode"
 msgstr "已在模式中"
 
-#: src/protocols/msn/error.c:70
+#: src/protocols/msn/error.c:71
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:75
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
-#: src/protocols/msn/error.c:78
+#: src/protocols/msn/error.c:79
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
-#: src/protocols/msn/error.c:81
+#: src/protocols/msn/error.c:82
 msgid "Notify Transfer failed"
 msgstr "通知传送失败"
 
-#: src/protocols/msn/error.c:85
+#: src/protocols/msn/error.c:86
 msgid "Required fields missing"
 msgstr "缺少必须域"
 
-#: src/protocols/msn/error.c:88 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "未登入"
 
-#: src/protocols/msn/error.c:92
+#: src/protocols/msn/error.c:93
 msgid "Internal server error"
 msgstr "内部服务器错误"
 
-#: src/protocols/msn/error.c:95
+#: src/protocols/msn/error.c:96
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
-#: src/protocols/msn/error.c:98
+#: src/protocols/msn/error.c:99
 msgid "File operation error"
 msgstr "文件操作错误"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:102
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:105
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
-#: src/protocols/msn/error.c:108
+#: src/protocols/msn/error.c:109
 msgid "Server busy"
 msgstr "服务器忙"
 
-#: src/protocols/msn/error.c:111
+#: src/protocols/msn/error.c:112
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:115
 msgid "Peer Notification server down"
 msgstr "点通知服务器维护中"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:118
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
-#: src/protocols/msn/error.c:121
+#: src/protocols/msn/error.c:122
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
-#: src/protocols/msn/error.c:125
+#: src/protocols/msn/error.c:126
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:130
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
-#: src/protocols/msn/error.c:135
+#: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "会话过载"
 
-#: src/protocols/msn/error.c:138
+#: src/protocols/msn/error.c:139
 msgid "User is too active"
 msgstr "用户太活跃"
 
-#: src/protocols/msn/error.c:141
+#: src/protocols/msn/error.c:142
 msgid "Too many sessions"
 msgstr "会话太多"
 
-#: src/protocols/msn/error.c:144
+#: src/protocols/msn/error.c:145
 msgid "Not expected"
 msgstr "未期待"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:148
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:152
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:155
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:158
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
-#: src/protocols/msn/error.c:161
+#: src/protocols/msn/error.c:162
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
-#: src/protocols/msn/error.c:165
+#: src/protocols/msn/error.c:166
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的错误代码 %d"
 
-#: src/protocols/msn/msn.c:59
+#: src/protocols/msn/msn.c:60
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:92
-#: src/protocols/msn/msn.c:150 src/protocols/msn/msn.c:473
-#: 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:690
-#: src/protocols/msn/msn.c:723 src/protocols/msn/msn.c:732
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:757
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:782
-#: src/protocols/msn/msn.c:804 src/protocols/msn/msn.c:855
-#: src/protocols/msn/msn.c:894 src/protocols/msn/msn.c:986
-#: src/protocols/msn/msn.c:1009 src/protocols/msn/msn.c:1024
-#: src/protocols/msn/msn.c:1036 src/protocols/msn/msn.c:1058
-#: src/protocols/msn/msn.c:1068 src/protocols/msn/notification.c:55
-#: src/protocols/msn/notification.c:85 src/protocols/msn/notification.c:858
-#: src/protocols/msn/buddyicon.c:169 src/protocols/msn/buddyicon.c:280
-#: src/protocols/msn/buddyicon.c:329 src/protocols/msn/buddyicon.c:435
-#: src/protocols/msn/buddyicon.c:522
+#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:91
+#: src/protocols/msn/msn.c:149 src/protocols/msn/msn.c:486
+#: src/protocols/msn/msn.c:595 src/protocols/msn/msn.c:611
+#: src/protocols/msn/msn.c:646 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:694 src/protocols/msn/msn.c:703
+#: src/protocols/msn/msn.c:736 src/protocols/msn/msn.c:745
+#: src/protocols/msn/msn.c:760 src/protocols/msn/msn.c:770
+#: src/protocols/msn/msn.c:785 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:817 src/protocols/msn/msn.c:868
+#: src/protocols/msn/msn.c:907 src/protocols/msn/msn.c:999
+#: src/protocols/msn/msn.c:1022 src/protocols/msn/msn.c:1037
+#: src/protocols/msn/msn.c:1049 src/protocols/msn/msn.c:1071
+#: src/protocols/msn/msn.c:1081 src/protocols/msn/notification.c:113
+#: src/protocols/msn/notification.c:143 src/protocols/msn/notification.c:900
 msgid "Write error"
 msgstr "写错误"
 
-#: src/protocols/msn/msn.c:162
-msgid "Set Friendly Name:"
-msgstr "设置友好的名称:"
-
-#: src/protocols/msn/msn.c:171
-msgid "Set Home Phone Number:"
-msgstr "设置家庭电话号码:"
-
-#: src/protocols/msn/msn.c:181
-msgid "Set Work Phone Number:"
-msgstr "设置办公电话号码:"
+#: src/protocols/msn/msn.c:167
+msgid "Set your friendly name."
+msgstr "设置您的友好名称。"
+
+#: src/protocols/msn/msn.c:168
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "这是其他的 MSN 好友看到的名字。"
+
+#: src/protocols/msn/msn.c:180
+msgid "Set your home phone number."
+msgstr "设置您的家庭电话号码。"
 
 #: src/protocols/msn/msn.c:191
-msgid "Set Mobile Phone Number:"
-msgstr "设置移动电话号码:"
+msgid "Set your work phone number."
+msgstr "设置您的工作电话号码。"
 
 #: src/protocols/msn/msn.c:202
+msgid "Set your mobile phone number."
+msgstr "设置您的移动电话号码。"
+
+#: src/protocols/msn/msn.c:214
 msgid "MSN Mobile Support"
 msgstr "MSN 移动支持"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:215
 msgid "Do you want to enable or disable MSN Mobile device support?"
 msgstr "您想要启用还是禁用 MSN 移动设备支持?"
 
-#: src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:218
 msgid "Enable"
 msgstr "启用"
 
-#: src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:219
 msgid "Disable"
 msgstr "禁用"
 
-#: src/protocols/msn/msn.c:217
-msgid "MSN Mobile Pages"
-msgstr "MSN 移动寻呼"
-
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:227
+msgid "Allow MSN Mobile pages?"
+msgstr "允许 MSN 移动寻呼吗?"
+
+#: src/protocols/msn/msn.c:228
 msgid ""
-"Do you want to allow or disallow people on your buddy list to send you "
-"mobile pages?"
-msgstr "您想要允许还是禁止您好友列表中的人给您发送移动寻呼?"
-
-#: src/protocols/msn/msn.c:221
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+"在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。"
+"您想要允许还是禁止这一功能?"
+
+#: src/protocols/msn/msn.c:232
 msgid "Allow"
 msgstr "允许"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:233
 msgid "Disallow"
 msgstr "禁止"
 
-#: src/protocols/msn/msn.c:239
-msgid "Send message:"
-msgstr "发送消息:"
-
-#: src/protocols/msn/msn.c:302 src/protocols/yahoo/yahoo.c:1141
+#: src/protocols/msn/msn.c:249
+msgid "Send a mobile message."
+msgstr "发送移动消息。"
+
+#: src/protocols/msn/msn.c:251
+msgid "Page"
+msgstr "寻呼"
+
+#: src/protocols/msn/msn.c:252 src/about.c:169 src/dialogs.c:4185
+#: src/prpl.c:423 src/prpl.c:732 src/server.c:1430
+msgid "Close"
+msgstr "关闭"
+
+#: src/protocols/msn/msn.c:315 src/protocols/yahoo/yahoo.c:1142
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>状态:</b> %s"
 
-#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:558
+#: src/protocols/msn/msn.c:328 src/protocols/msn/msn.c:571
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "远离电脑"
 
-#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:560
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1068
-#: src/protocols/yahoo/yahoo.c:1273 src/protocols/yahoo/yahoo.c:1349
+#: src/protocols/msn/msn.c:329 src/protocols/msn/msn.c:573
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1069
+#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1353
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:562
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1070
-#: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1350
+#: src/protocols/msn/msn.c:330 src/protocols/msn/msn.c:575
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1354
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:318 src/protocols/msn/msn.c:564
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1078
-#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1354
+#: src/protocols/msn/msn.c:331 src/protocols/msn/msn.c:577
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1079
+#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1358
 msgid "On The Phone"
 msgstr "接听电话"
 
-#: src/protocols/msn/msn.c:319 src/protocols/msn/msn.c:566
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1082
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1356
+#: src/protocols/msn/msn.c:332 src/protocols/msn/msn.c:579
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1083
+#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1360
 msgid "Out To Lunch"
 msgstr "外出就餐"
 
-#: src/protocols/msn/msn.c:320 src/protocols/msn/msn.c:568
-#: src/protocols/zephyr/zephyr.c:859 src/protocols/zephyr/zephyr.c:874
+#: src/protocols/msn/msn.c:333 src/protocols/msn/msn.c:581
+#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
 msgid "Hidden"
 msgstr "隐身"
 
-#: src/protocols/msn/msn.c:332
+#: src/protocols/msn/msn.c:345
 msgid "Set Friendly Name"
 msgstr "设置友好的名称"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:353
 msgid "Set Home Phone Number"
 msgstr "设置家庭电话号码"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:359
 msgid "Set Work Phone Number"
 msgstr "设置工作电话号码"
 
-#: src/protocols/msn/msn.c:352
+#: src/protocols/msn/msn.c:365
 msgid "Set Mobile Phone Number"
 msgstr "设置移动电话号码"
 
-#: src/protocols/msn/msn.c:361
+#: src/protocols/msn/msn.c:374
 msgid "Enable/Disable Mobile Devices"
 msgstr "启用/禁用移动设备"
 
-#: src/protocols/msn/msn.c:368
+#: src/protocols/msn/msn.c:381
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允许/禁止移动寻呼"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:403
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:675
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1971,11 +2003,11 @@
 "MSN 用户名的格式必须是“user@server.com”。可能您希望的是 %s@hotmail.com。您的"
 "允许列表未作任何更改。"
 
-#: src/protocols/msn/msn.c:666 src/protocols/msn/msn.c:707
+#: src/protocols/msn/msn.c:679 src/protocols/msn/msn.c:720
 msgid "Invalid MSN screenname"
 msgstr "无效的 MSN 用户名"
 
-#: src/protocols/msn/msn.c:703
+#: src/protocols/msn/msn.c:716
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -1994,61 +2026,61 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1182 src/protocols/msn/msn.c:1184
+#: src/protocols/msn/msn.c:1195 src/protocols/msn/msn.c:1197
 msgid "MSN Protocol Plugin"
 msgstr "MSN 协议插件"
 
-#: src/protocols/msn/msn.c:1202
+#: src/protocols/msn/msn.c:1215
 msgid "Login Server:"
 msgstr "登录服务器:"
 
-#: src/protocols/msn/notification.c:166
+#: src/protocols/msn/notification.c:224
 msgid "Unable to request INF"
 msgstr "无法请求 INF"
 
-#: src/protocols/msn/notification.c:192
+#: src/protocols/msn/notification.c:250
 msgid "Unable to send USR"
 msgstr "无法发送 USR"
 
-#: src/protocols/msn/notification.c:222
+#: src/protocols/msn/notification.c:282
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:306
 msgid "Unable to send password"
 msgstr "无法发送密码"
 
-#: src/protocols/msn/notification.c:252
+#: src/protocols/msn/notification.c:312
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: src/protocols/msn/notification.c:269
+#: src/protocols/msn/notification.c:329
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您已经被断开。原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/msn/notification.c:275
+#: src/protocols/msn/notification.c:335
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已经被断开。MSN 服务器目前维护中。"
 
-#: src/protocols/msn/notification.c:370
+#: src/protocols/msn/notification.c:440
 #, 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:643
+#: src/protocols/msn/notification.c:713
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "用户 %s(%s) 想要将您添加为好友。"
 
-#: src/protocols/msn/notification.c:1040
+#: src/protocols/msn/notification.c:1082
 msgid "Got invalid XFR"
 msgstr "得到无效的 XFR"
 
-#: src/protocols/msn/notification.c:1083
+#: src/protocols/msn/notification.c:1125
 msgid "Unable to transfer to notification server"
 msgstr "无法传送到通知服务器。"
 
-#: src/protocols/msn/notification.c:1209
+#: src/protocols/msn/notification.c:1251
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2063,8 +2095,8 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1088
-#: src/gtkpounce.c:568 src/prefs.c:1107
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1089
+#: src/gtkpounce.c:570 src/gtkprefs.c:1108
 msgid "Idle"
 msgstr "瞌睡"
 
@@ -2077,11 +2109,7 @@
 msgid "%s has closed the conversation window."
 msgstr "%s 已经关闭了对话窗口。"
 
-#.
-#. * TODO: Investigate this, as it seems to occur frequently with
-#. *       the old prpl.
-#.
-#: src/protocols/msn/switchboard.c:224
+#: src/protocols/msn/switchboard.c:225
 msgid "An MSN message may not have been received."
 msgstr "MSN 消息可能没有收到。"
 
@@ -2100,38 +2128,34 @@
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:344
+#: src/protocols/napster/napster.c:345
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:400
+#: src/protocols/napster/napster.c:401
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 请求您的信息"
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/napster/napster.c:429
+#: src/protocols/napster/napster.c:431
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您已经从服务器断开,原因是您在其它位置登入了。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:434
+#: src/protocols/napster/napster.c:437
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 请求 PING"
 
-#: src/protocols/napster/napster.c:548 src/gtkblist.c:1493
+#: src/protocols/napster/napster.c:551 src/gtkblist.c:1500
 msgid "Get Info"
 msgstr "信息"
 
-#: src/protocols/napster/napster.c:562 src/protocols/oscar/oscar.c:5060
-#: src/protocols/toc/toc.c:1191
+#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5089
+#: src/protocols/toc/toc.c:1195
 msgid "Join what group:"
 msgstr "加入组:"
 
@@ -2145,7 +2169,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:638 src/protocols/napster/napster.c:640
+#: src/protocols/napster/napster.c:641 src/protocols/napster/napster.c:643
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 协议插件"
 
@@ -2260,65 +2284,65 @@
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:854
+#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:855
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: src/protocols/oscar/oscar.c:571
+#: src/protocols/oscar/oscar.c:572
 msgid "Chat is currently unavailable"
 msgstr "聊天目前不可用"
 
-#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:706
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:690
 msgid "Unable to login to AIM"
 msgstr "无法登入 AIM"
 
-#: src/protocols/oscar/oscar.c:799 src/protocols/oscar/oscar.c:1182
+#: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/protocols/oscar/oscar.c:806
+#: src/protocols/oscar/oscar.c:808
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
-#: src/protocols/oscar/oscar.c:873 src/protocols/oscar/oscar.c:884
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
+#: src/protocols/oscar/oscar.c:892
 msgid "File Transfer Aborted"
 msgstr "文件传送中止"
 
-#: src/protocols/oscar/oscar.c:873
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish listener socket."
 msgstr "无法建立监听套接字。"
 
-#: src/protocols/oscar/oscar.c:884
+#: src/protocols/oscar/oscar.c:888
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:893
 msgid "Unable to create new connection."
 msgstr "无法创建新连接。"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1072 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "昵称或密码不对。"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1081
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1080
+#: src/protocols/oscar/oscar.c:1085
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1084
+#: src/protocols/oscar/oscar.c:1089
 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."
@@ -2327,21 +2351,21 @@
 "能会更长。"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1088
+#: src/protocols/oscar/oscar.c:1093
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: src/protocols/oscar/oscar.c:1092 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "认证失败"
 
-#: src/protocols/oscar/oscar.c:1120
+#: src/protocols/oscar/oscar.c:1125
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1221 src/protocols/oscar/oscar.c:1250
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1226 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:1344
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2349,29 +2373,29 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: src/protocols/oscar/oscar.c:1223 src/protocols/oscar/oscar.c:1252
+#: src/protocols/oscar/oscar.c:1229 src/protocols/oscar/oscar.c:1259
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 无法获取有效的 AIM 登录码。"
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1347
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 无法获取有效的登录码。"
 
-#: src/protocols/oscar/oscar.c:1892 src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5407
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "与 %s 的二人世界已建立"
 
-#: src/protocols/oscar/oscar.c:2219 src/protocols/oscar/oscar.c:2241
+#: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
 msgid "(There was an error receiving this message)"
 msgstr "(接收此消息出错)"
 
-#: src/protocols/oscar/oscar.c:2386
+#: src/protocols/oscar/oscar.c:2395
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: src/protocols/oscar/oscar.c:2387
+#: src/protocols/oscar/oscar.c:2396
 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 "
@@ -2380,42 +2404,42 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2422
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2430
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: src/protocols/oscar/oscar.c:2421
+#: src/protocols/oscar/oscar.c:2431
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2459
 #, 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:2450
+#: src/protocols/oscar/oscar.c:2463
 msgid "Request Authorization"
 msgstr "请求认证"
 
-#: src/protocols/oscar/oscar.c:2484 src/protocols/oscar/oscar.c:2486
-#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2560
-#: src/protocols/oscar/oscar.c:2574 src/protocols/oscar/oscar.c:2940
-#: src/protocols/oscar/oscar.c:2991 src/protocols/oscar/oscar.c:4985
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:2497 src/protocols/oscar/oscar.c:2499
+#: src/protocols/oscar/oscar.c:2506 src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2591 src/protocols/oscar/oscar.c:2960
+#: src/protocols/oscar/oscar.c:3012 src/protocols/oscar/oscar.c:5014
+#: src/protocols/oscar/oscar.c:5056
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: src/protocols/oscar/oscar.c:2492
+#: src/protocols/oscar/oscar.c:2505
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: src/protocols/oscar/oscar.c:2560
+#: src/protocols/oscar/oscar.c:2577
 #, c-format
 msgid ""
 "The user %lu wants to add you to their buddy list for the following reason:\n"
@@ -2424,11 +2448,11 @@
 "用户 %lu 想要将您加为他/她的好友,理由如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2567 src/protocols/oscar/oscar.c:4990
+#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
 msgid "Authorization Request"
 msgstr "认证请求"
 
-#: src/protocols/oscar/oscar.c:2574
+#: src/protocols/oscar/oscar.c:2591
 #, c-format
 msgid ""
 "The user %lu has denied your request to add them to your contact list for "
@@ -2438,17 +2462,17 @@
 "用户 %lu 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2575
+#: src/protocols/oscar/oscar.c:2592
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2581
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid "The user %lu has granted your request to add them to your contact list."
 msgstr "用户 %lu 同意您将他/她加为好友。"
 
-#: src/protocols/oscar/oscar.c:2588
+#: src/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2461,7 +2485,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2596
+#: src/protocols/oscar/oscar.c:2615
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2474,7 +2498,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2604
+#: src/protocols/oscar/oscar.c:2623
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2487,32 +2511,32 @@
 "内容是:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2625
+#: src/protocols/oscar/oscar.c:2644
 #, c-format
 msgid "ICQ user %lu has sent you a contact: %s (%s)"
 msgstr "ICQ 用户 %lu 给您发送了一个联系人:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2648
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您是否想要将此联系人加为好友?"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2648
 msgid "Decline"
 msgstr "拒绝"
 
-#: src/protocols/oscar/oscar.c:2711
+#: src/protocols/oscar/oscar.c:2730
 #, 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:2720
+#: src/protocols/oscar/oscar.c:2739
 #, 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:2729
+#: src/protocols/oscar/oscar.c:2748
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2520,167 +2544,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:2738
+#: src/protocols/oscar/oscar.c:2757
 #, 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:2747
+#: src/protocols/oscar/oscar.c:2766
 #, 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:2756
+#: src/protocols/oscar/oscar.c:2775
 #, 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:2772 src/protocols/oscar/oscar.c:4468
-#: src/protocols/oscar/oscar.c:5659
+#: src/protocols/oscar/oscar.c:2791 src/protocols/oscar/oscar.c:4496
+#: src/protocols/oscar/oscar.c:5688
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: src/protocols/oscar/oscar.c:2776 src/protocols/oscar/oscar.c:4462
-#: src/protocols/oscar/oscar.c:5657
+#: src/protocols/oscar/oscar.c:2795 src/protocols/oscar/oscar.c:4490
+#: src/protocols/oscar/oscar.c:5686
 msgid "Not Available"
 msgstr "不可用"
 
-#: src/protocols/oscar/oscar.c:2778 src/protocols/oscar/oscar.c:4465
-#: src/protocols/oscar/oscar.c:5658
+#: src/protocols/oscar/oscar.c:2797 src/protocols/oscar/oscar.c:4493
+#: src/protocols/oscar/oscar.c:5687
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2801
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:2861
 #, 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:2844
+#: src/protocols/oscar/oscar.c:2863
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>状态:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2922
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 扔出错误:%s\n"
 
-#: src/protocols/oscar/oscar.c:2904
+#: src/protocols/oscar/oscar.c:2923
 msgid "Unknown error"
 msgstr "未知错误"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2939
+#: src/protocols/oscar/oscar.c:2958
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您给 %s 的消息未发送:"
 
-#: src/protocols/oscar/oscar.c:2990
+#: src/protocols/oscar/oscar.c:3010
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s 的用户信息可用:"
 
-#: src/protocols/oscar/oscar.c:3023
+#: src/protocols/oscar/oscar.c:3044
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: src/protocols/oscar/oscar.c:3026
+#: src/protocols/oscar/oscar.c:3047
 msgid "Voice"
 msgstr "语音"
 
-#: src/protocols/oscar/oscar.c:3029 src/protocols/oscar/oscar.c:5683
+#: src/protocols/oscar/oscar.c:3050 src/protocols/oscar/oscar.c:5712
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: src/protocols/oscar/oscar.c:3032 src/gtkblist.c:1502
+#: src/protocols/oscar/oscar.c:3053 src/gtkblist.c:1509
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:3035 src/protocols/oscar/oscar.c:5695
+#: src/protocols/oscar/oscar.c:3056 src/protocols/oscar/oscar.c:5724
 msgid "Get File"
 msgstr "获取文件"
 
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5689
+#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5718
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/protocols/oscar/oscar.c:3042
+#: src/protocols/oscar/oscar.c:3063
 msgid "Games"
 msgstr "游戏"
 
-#: src/protocols/oscar/oscar.c:3045
+#: src/protocols/oscar/oscar.c:3066
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: src/protocols/oscar/oscar.c:3048
+#: src/protocols/oscar/oscar.c:3069
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3072
 msgid "EveryBuddy Bug"
 msgstr "每个好友的 Bug"
 
-#: src/protocols/oscar/oscar.c:3054
+#: src/protocols/oscar/oscar.c:3075
 msgid "AP User"
 msgstr "AP 用户"
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3078
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3060
+#: src/protocols/oscar/oscar.c:3081
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3084
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3087
 msgid "ICQ Unknown"
 msgstr "ICQ 未知"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3090
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3093
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3132
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>无法显示信息,原因是其发送编码未知。</i>"
 
-#: src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3139
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上线时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3144
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成员时间:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3150
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "瞌睡:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3153
 msgid "Idle: <b>Active</b>"
 msgstr "瞌睡:<b>活跃</b>"
 
-#: src/protocols/oscar/oscar.c:3134
+#: src/protocols/oscar/oscar.c:3155
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2693,206 +2717,206 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3187
 msgid "<i>User has no away message</i>"
 msgstr "<i>用户无离开消息</i>"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3198
 msgid "Client Capabilities: "
 msgstr "客户能力:"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3204
 msgid "<i>No Information Provided</i>"
 msgstr "<i>没有提供信息</i>"
 
-#: src/protocols/oscar/oscar.c:3206
+#: src/protocols/oscar/oscar.c:3228
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
-#: src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:3589
 msgid "Rate limiting error."
 msgstr "速度限制错误。"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3590
 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:3627
+#: src/protocols/oscar/oscar.c:3650
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您已经断开了连接,原因是您在其它位置用此用户名登入了。"
 
-#: src/protocols/oscar/oscar.c:3629
+#: src/protocols/oscar/oscar.c:3652
 msgid "You have been signed off for an unknown reason."
 msgstr "您已经登出了,原因未知。"
 
-#: src/protocols/oscar/oscar.c:3856
+#: src/protocols/oscar/oscar.c:3879
 msgid "UIN:"
 msgstr "UIN:"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3884
 msgid "First Name:"
 msgstr "名:"
 
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3887
 msgid "Last Name:"
 msgstr "姓:"
 
-#: src/protocols/oscar/oscar.c:3867 src/protocols/oscar/oscar.c:3873
+#: src/protocols/oscar/oscar.c:3890 src/protocols/oscar/oscar.c:3896
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: src/protocols/oscar/oscar.c:3878
-msgid "Mobile Phone:"
-msgstr "移动电话:"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Gender:"
-msgstr "性别:"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Female"
-msgstr "女"
-
-#: src/protocols/oscar/oscar.c:3881
-msgid "Male"
-msgstr "男"
-
-#: src/protocols/oscar/oscar.c:3890
-msgid "Birthday:"
-msgstr "生日:"
-
-#: src/protocols/oscar/oscar.c:3895
-msgid "Age:"
-msgstr "年龄:"
-
-#: src/protocols/oscar/oscar.c:3898
-msgid "Personal Web Page:"
-msgstr "个人主页:"
-
 #: src/protocols/oscar/oscar.c:3901
-msgid "Additional Information:"
-msgstr "额外信息:"
-
-#: src/protocols/oscar/oscar.c:3905
-msgid "Home Address:"
-msgstr "家庭住址:"
-
-#: src/protocols/oscar/oscar.c:3907 src/protocols/oscar/oscar.c:3923
-msgid "Address:"
-msgstr "地址:"
-
-#: src/protocols/oscar/oscar.c:3910 src/protocols/oscar/oscar.c:3926
-msgid "City:"
-msgstr "城市:"
-
-#: src/protocols/oscar/oscar.c:3913 src/protocols/oscar/oscar.c:3929
-msgid "State:"
-msgstr "州/省:"
-
-#: src/protocols/oscar/oscar.c:3916 src/protocols/oscar/oscar.c:3932
-msgid "Zip Code:"
-msgstr "邮政编码:"
+msgid "Mobile Phone:"
+msgstr "移动电话:"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Gender:"
+msgstr "性别:"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Female"
+msgstr "女"
+
+#: src/protocols/oscar/oscar.c:3904
+msgid "Male"
+msgstr "男"
+
+#: src/protocols/oscar/oscar.c:3913
+msgid "Birthday:"
+msgstr "生日:"
+
+#: src/protocols/oscar/oscar.c:3918
+msgid "Age:"
+msgstr "年龄:"
 
 #: src/protocols/oscar/oscar.c:3921
+msgid "Personal Web Page:"
+msgstr "个人主页:"
+
+#: src/protocols/oscar/oscar.c:3924
+msgid "Additional Information:"
+msgstr "额外信息:"
+
+#: src/protocols/oscar/oscar.c:3928
+msgid "Home Address:"
+msgstr "家庭住址:"
+
+#: src/protocols/oscar/oscar.c:3930 src/protocols/oscar/oscar.c:3946
+msgid "Address:"
+msgstr "地址:"
+
+#: src/protocols/oscar/oscar.c:3933 src/protocols/oscar/oscar.c:3949
+msgid "City:"
+msgstr "城市:"
+
+#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+msgid "State:"
+msgstr "州/省:"
+
+#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+msgid "Zip Code:"
+msgstr "邮政编码:"
+
+#: src/protocols/oscar/oscar.c:3944
 msgid "Work Address:"
 msgstr "办公地址:"
 
-#: src/protocols/oscar/oscar.c:3937
+#: src/protocols/oscar/oscar.c:3960
 msgid "Work Information:"
 msgstr "工作信息:"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3962
 msgid "Company:"
 msgstr "公司:"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3965
 msgid "Division:"
 msgstr "部门:"
 
-#: src/protocols/oscar/oscar.c:3945
+#: src/protocols/oscar/oscar.c:3968
 msgid "Position:"
 msgstr "职务:"
 
-#: src/protocols/oscar/oscar.c:3948
+#: src/protocols/oscar/oscar.c:3971
 msgid "Web Page:"
 msgstr "网页:"
 
-#: src/protocols/oscar/oscar.c:4016
+#: src/protocols/oscar/oscar.c:4039
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s 拥有下列用户名:</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4034
+#: src/protocols/oscar/oscar.c:4057
 #, c-format
 msgid "No results found for email address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4078
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: src/protocols/oscar/oscar.c:4057
+#: src/protocols/oscar/oscar.c:4080
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: src/protocols/oscar/oscar.c:4085
+#: src/protocols/oscar/oscar.c:4108
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: src/protocols/oscar/oscar.c:4088
+#: src/protocols/oscar/oscar.c:4111
 #, 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:4091
+#: src/protocols/oscar/oscar.c:4114
 #, 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:4094
+#: src/protocols/oscar/oscar.c:4117
 #, 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:4097
+#: src/protocols/oscar/oscar.c:4120
 #, 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:4100
+#: src/protocols/oscar/oscar.c:4123
 #, 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:4103
+#: src/protocols/oscar/oscar.c:4126
 #, 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:4106
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: src/protocols/oscar/oscar.c:4116
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2901,20 +2925,20 @@
 "您的用户名格式化后如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4140 src/protocols/oscar/oscar.c:4146
 msgid "Account Info"
 msgstr "账户信息"
 
-#: src/protocols/oscar/oscar.c:4122
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: src/protocols/oscar/oscar.c:4344
+#: src/protocols/oscar/oscar.c:4367
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: src/protocols/oscar/oscar.c:4345
+#: src/protocols/oscar/oscar.c:4368
 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 "
@@ -2923,22 +2947,22 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4372
+#: src/protocols/oscar/oscar.c:4397
 #, 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:4374
+#: src/protocols/oscar/oscar.c:4399
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: src/protocols/oscar/oscar.c:4390
+#: src/protocols/oscar/oscar.c:4415
 msgid "Unable to set AIM away message."
 msgstr "无法设置 AIM 离开消息。"
 
-#: src/protocols/oscar/oscar.c:4391
+#: src/protocols/oscar/oscar.c:4416
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2947,7 +2971,7 @@
 "您在登录过程完成之前请求设定离开消息。您仍将处于目前的状态;请在您完全连接后"
 "再试一次。"
 
-#: src/protocols/oscar/oscar.c:4427
+#: src/protocols/oscar/oscar.c:4455
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -2956,15 +2980,15 @@
 "已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
 "开。"
 
-#: src/protocols/oscar/oscar.c:4429
+#: src/protocols/oscar/oscar.c:4457
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:4670
 msgid "Unable To Retrive Buddy List"
 msgstr "无法获取好友列表"
 
-#: src/protocols/oscar/oscar.c:4642
+#: src/protocols/oscar/oscar.c:4671
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2973,12 +2997,12 @@
 "Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
 "小时就能用了。"
 
-#: src/protocols/oscar/oscar.c:4732 src/protocols/oscar/oscar.c:4733
-#: src/protocols/oscar/oscar.c:4738
+#: src/protocols/oscar/oscar.c:4761 src/protocols/oscar/oscar.c:4762
+#: src/protocols/oscar/oscar.c:4767
 msgid "Orphans"
 msgstr "孤儿"
 
-#: src/protocols/oscar/oscar.c:4902
+#: src/protocols/oscar/oscar.c:4931
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -2986,15 +3010,15 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4931 src/protocols/oscar/oscar.c:4944
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: src/protocols/oscar/oscar.c:4903 src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4932 src/protocols/oscar/oscar.c:4945
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:4944
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3004,18 +3028,18 @@
 "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
 "允许的最大值。"
 
-#: src/protocols/oscar/oscar.c:4950
+#: src/protocols/oscar/oscar.c:4979
 #, 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:4955
+#: src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "给出的认证"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3025,17 +3049,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5023
+#: src/protocols/oscar/oscar.c:5052
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5053
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5056
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3045,87 +3069,87 @@
 "用户 %s 拒绝了您将其加入联系人列表的请求,原因如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5028
+#: src/protocols/oscar/oscar.c:5057
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/toc/toc.c:1196
+#: src/protocols/oscar/oscar.c:5094 src/protocols/toc/toc.c:1200
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:5285
+#: src/protocols/oscar/oscar.c:5314
 msgid "<b>Status:</b> "
 msgstr "<b>状态:</b>"
 
-#: src/protocols/oscar/oscar.c:5294
+#: src/protocols/oscar/oscar.c:5323
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入:</b>"
 
-#: src/protocols/oscar/oscar.c:5301
+#: src/protocols/oscar/oscar.c:5330
 msgid "<b>Capabilities:</b> "
 msgstr "<b>能力:</b>"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5338
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>状态:</b>未认证"
 
-#: src/protocols/oscar/oscar.c:5313 src/gtkblist.c:855
+#: src/protocols/oscar/oscar.c:5342 src/gtkblist.c:861
 msgid "<b>Status:</b> Offline"
 msgstr "<b>状态:</b> 离线"
 
-#: src/protocols/oscar/oscar.c:5339
+#: src/protocols/oscar/oscar.c:5368
 msgid "Offline"
 msgstr "离线"
 
-#: src/protocols/oscar/oscar.c:5520
+#: src/protocols/oscar/oscar.c:5549
 msgid "Unable to open Direct IM"
 msgstr "无法开始二人世界"
 
-#: src/protocols/oscar/oscar.c:5533
+#: src/protocols/oscar/oscar.c:5562
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: src/protocols/oscar/oscar.c:5534
+#: src/protocols/oscar/oscar.c:5563
 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:5673
+#: src/protocols/oscar/oscar.c:5702
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: src/protocols/oscar/oscar.c:5707
+#: src/protocols/oscar/oscar.c:5736
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: src/protocols/oscar/oscar.c:5728
+#: src/protocols/oscar/oscar.c:5757
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: src/protocols/oscar/oscar.c:5729
+#: src/protocols/oscar/oscar.c:5758
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: src/protocols/oscar/oscar.c:5735
+#: src/protocols/oscar/oscar.c:5764
 msgid "New screenname formatting:"
 msgstr "新的用户名格式化:"
 
-#: src/protocols/oscar/oscar.c:5780
-msgid "Change Address To: "
+#: src/protocols/oscar/oscar.c:5813
+msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:5826
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "您正在等待下列好友的认证:<BR>"
 
-#: src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5851
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: src/protocols/oscar/oscar.c:5820
+#: src/protocols/oscar/oscar.c:5856
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3134,31 +3158,31 @@
 "%s<BR><BR>如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后"
 "单击“重新请求认证”。"
 
-#: src/protocols/oscar/oscar.c:5853
+#: src/protocols/oscar/oscar.c:5889
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: src/protocols/oscar/oscar.c:5864
+#: src/protocols/oscar/oscar.c:5900
 msgid "Format Screenname"
 msgstr "格式化用户名"
 
-#: src/protocols/oscar/oscar.c:5870
+#: src/protocols/oscar/oscar.c:5906
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: src/protocols/oscar/oscar.c:5876
+#: src/protocols/oscar/oscar.c:5912
 msgid "Display Current Registered Address"
 msgstr "显示当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:5918
 msgid "Change Current Registered Address"
 msgstr "更改当前注册的地址"
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5927
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: src/protocols/oscar/oscar.c:5899
+#: src/protocols/oscar/oscar.c:5935
 msgid "Search for Buddy by Email"
 msgstr "按电子邮件搜索好友"
 
@@ -3172,15 +3196,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6019 src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6057
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 协议插件"
 
-#: src/protocols/oscar/oscar.c:6039
+#: src/protocols/oscar/oscar.c:6075
 msgid "Auth Host:"
 msgstr "认证主机:"
 
-#: src/protocols/oscar/oscar.c:6045
+#: src/protocols/oscar/oscar.c:6081
 msgid "Auth Port:"
 msgstr "认证端口:"
 
@@ -3313,19 +3337,19 @@
 msgid "Waiting for reply..."
 msgstr "正在等候回复..."
 
-#: src/protocols/toc/toc.c:684
+#: src/protocols/toc/toc.c:685
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
 
-#: src/protocols/toc/toc.c:873
+#: src/protocols/toc/toc.c:874
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:878
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 发送了 PAUSE 命令。"
 
-#: src/protocols/toc/toc.c:876
+#: src/protocols/toc/toc.c:879
 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 "
@@ -3335,48 +3359,52 @@
 "将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
 "刻。"
 
-#: src/protocols/toc/toc.c:1319
+#: src/protocols/toc/toc.c:1323
 msgid "Get Dir Info"
 msgstr "获取目录信息"
 
-#: src/protocols/toc/toc.c:1443
+#: src/protocols/toc/toc.c:1447
 msgid "Set Dir Info"
 msgstr "设置目录信息"
 
-#: src/protocols/toc/toc.c:1566
+#: src/protocols/toc/toc.c:1570
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "无法打开 %s 写入!"
 
-#: src/protocols/toc/toc.c:1644 src/protocols/toc/toc.c:1683
-#: src/protocols/toc/toc.c:1891
+#: src/protocols/toc/toc.c:1606
+msgid "File transfer failed; other side probably canceled."
+msgstr "文件传送失败;可能其中一端取消了传送。"
+
+#: src/protocols/toc/toc.c:1651 src/protocols/toc/toc.c:1691
+#: src/protocols/toc/toc.c:1903
 msgid "Could not connect for transfer."
 msgstr "无法连接进行传送。"
 
-#: src/protocols/toc/toc.c:1806
+#: src/protocols/toc/toc.c:1815
 msgid "Could not connect for transfer!"
 msgstr "无法连接进行传送!"
 
-#: src/protocols/toc/toc.c:1838
+#: src/protocols/toc/toc.c:1848
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "无法写入文件头。文件将不会被传送。"
 
-#: src/protocols/toc/toc.c:1936 src/gtkft.c:1056
+#: src/protocols/toc/toc.c:1948 src/gtkft.c:1058
 msgid "Gaim - Save As..."
 msgstr "Gaim - 另存为..."
 
-#: src/protocols/toc/toc.c:1970
+#: src/protocols/toc/toc.c:1982
 #, 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:1977
+#: src/protocols/toc/toc.c:1989
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求您发送文件"
 
-#: src/protocols/toc/toc.c:1979 src/gtkft.c:1109 src/server.c:1237
+#: src/protocols/toc/toc.c:1991 src/gtkft.c:1111 src/server.c:1239
 msgid "Accept"
 msgstr "接受"
 
@@ -3390,56 +3418,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2049 src/protocols/toc/toc.c:2051
+#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: src/protocols/toc/toc.c:2069
+#: src/protocols/toc/toc.c:2081
 msgid "TOC Host:"
 msgstr "TOC 主机:"
 
-#: src/protocols/toc/toc.c:2075
+#: src/protocols/toc/toc.c:2087
 msgid "TOC Port:"
 msgstr "TOC 端口:"
 
-#: src/protocols/yahoo/yahoo.c:604
+#: src/protocols/yahoo/yahoo.c:605
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: src/protocols/yahoo/yahoo.c:1072 src/protocols/yahoo/yahoo.c:1277
-#: src/protocols/yahoo/yahoo.c:1351
+#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1355
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1074 src/protocols/yahoo/yahoo.c:1279
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1283
+#: src/protocols/yahoo/yahoo.c:1356
 msgid "Not At Desk"
 msgstr "不在桌前"
 
-#: src/protocols/yahoo/yahoo.c:1076 src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1285
+#: src/protocols/yahoo/yahoo.c:1357
 msgid "Not In Office"
 msgstr "不在办公室"
 
-#: src/protocols/yahoo/yahoo.c:1080 src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1355
+#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1289
+#: src/protocols/yahoo/yahoo.c:1359
 msgid "On Vacation"
 msgstr "度假中"
 
-#: src/protocols/yahoo/yahoo.c:1084 src/protocols/yahoo/yahoo.c:1289
-#: src/protocols/yahoo/yahoo.c:1357
+#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1293
+#: src/protocols/yahoo/yahoo.c:1361
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: src/protocols/yahoo/yahoo.c:1209
+#: src/protocols/yahoo/yahoo.c:1202
+msgid "Active which ID?"
+msgstr "激活哪个 ID?"
+
+#: src/protocols/yahoo/yahoo.c:1213
 msgid "Activate ID"
 msgstr "激活 ID"
 
-#: src/protocols/yahoo/yahoo.c:1434
+#: src/protocols/yahoo/yahoo.c:1438
 msgid "Pager Host:"
 msgstr "寻呼主机:"
 
-#: src/protocols/yahoo/yahoo.c:1440
+#: src/protocols/yahoo/yahoo.c:1444
 msgid "Pager Port:"
 msgstr "寻呼端口:"
 
@@ -3453,7 +3485,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1526 src/protocols/yahoo/yahoo.c:1528
+#: src/protocols/yahoo/yahoo.c:1530 src/protocols/yahoo/yahoo.c:1532
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
@@ -3480,11 +3512,11 @@
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:598
 msgid "Already logged in with Zephyr"
 msgstr "已经登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:599
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -3492,19 +3524,19 @@
 "由于 Zephyr 将使用您的系统用户名,如果您已用相同的用户登入,您将无法拥有多个"
 "账户。"
 
-#: src/protocols/zephyr/zephyr.c:844
+#: src/protocols/zephyr/zephyr.c:847
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:884
+#: src/protocols/zephyr/zephyr.c:887
 msgid "Class:"
 msgstr "类:"
 
-#: src/protocols/zephyr/zephyr.c:889
+#: src/protocols/zephyr/zephyr.c:892
 msgid "Instance:"
 msgstr "实例:"
 
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:897
 msgid "Recipient:"
 msgstr "接受者:"
 
@@ -3518,7 +3550,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1026 src/protocols/zephyr/zephyr.c:1028
+#: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
@@ -3586,11 +3618,6 @@
 "Spencer (原始作者) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (骇客和专属驱动程序[lazy bum])<BR><BR>"
 
-#: src/about.c:169 src/dialogs.c:4239 src/prpl.c:500 src/prpl.c:806
-#: src/server.c:1428
-msgid "Close"
-msgstr "关闭"
-
 #: src/away.c:221
 msgid "Gaim - Away!"
 msgstr "Gaim - 离开!"
@@ -3611,11 +3638,11 @@
 msgid "Set All Away"
 msgstr "全部设为离开"
 
-#: src/blist.c:365 src/prefs.c:1812
+#: src/blist.c:366 src/gtkprefs.c:1813
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:677
+#: src/blist.c:678
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3624,134 +3651,134 @@
 "%2$s 组中的 %1$d 个好友未删除,原因是他们的账户未登入。这些好友和该组不会被删"
 "除。\n"
 
-#: src/blist.c:681
-msgid "Group Not Removed"
+#: src/blist.c:683
+msgid "Group not removed"
 msgstr "组未删除"
 
-#: src/blist.c:848
+#: src/blist.c:850
 msgid "Invalid Groupname"
 msgstr "组名无效"
 
-#: src/blist.c:1570
+#: src/blist.c:1572
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "处理您的好友列表时出错。好友列表未装入。"
 
-#: src/blist.c:1572
+#: src/blist.c:1574
 msgid "Buddy List Error"
 msgstr "好友列表出错"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1578
+#: src/blist.c:1580
 #, 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:1581
+#: src/blist.c:1583
 msgid "Converting Buddy List"
 msgstr "正在转换好友列表"
 
-#: src/browser.c:426 src/browser.c:453
+#: src/browser.c:429 src/browser.c:457
 msgid ""
-"Communication with the browser failed.  Please close all windows and try "
+"Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr "与浏览器通讯出现问题。请关闭所有窗口,稍后再试一次。"
 
-#: src/browser.c:586
+#: src/browser.c:591
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
 msgstr "无法调用您的浏览器,原因是选择了“手动”浏览器命令,但未设置命令。"
 
-#: src/browser.c:601
+#: src/browser.c:609
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "调用您选择的浏览器 %s 出错"
 
-#: src/buddy_chat.c:249 src/dialogs.c:1405
+#: src/buddy_chat.c:250
 msgid ""
-"You are not currently signed on with any protocols that have the ability to "
+"You are not currently signed on wit any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: src/buddy_chat.c:262
+#: src/buddy_chat.c:264
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:268
+#: src/buddy_chat.c:270
 msgid "Buddy Chat"
 msgstr "好友聊天"
 
-#: src/buddy_chat.c:278
+#: src/buddy_chat.c:280
 msgid "Join Chat As:"
 msgstr "加入聊天为:"
 
 #. Join button.
-#: src/buddy_chat.c:301
+#: src/buddy_chat.c:303
 msgid "Join"
 msgstr "加入"
 
-#: src/conversation.c:402
+#: src/conversation.c:404
 msgid "Unable to send message. The message is too large."
 msgstr "无法发送消息。消息太大。"
 
-#: src/conversation.c:411
+#: src/conversation.c:412
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: src/conversation.c:1972
+#: src/conversation.c:1973
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: src/conversation.c:1975
+#: src/conversation.c:1976
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: src/conversation.c:2024
+#: src/conversation.c:2025
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2068
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: src/conversation.c:2069
+#: src/conversation.c:2070
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: src/conversation.c:2253
+#: src/conversation.c:2254
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: src/conversation.c:2255
+#: src/conversation.c:2256
 msgid "New window"
 msgstr "新建窗口"
 
-#: src/conversation.c:2257
+#: src/conversation.c:2258
 msgid "By group"
 msgstr "按组"
 
-#: src/conversation.c:2259
+#: src/conversation.c:2260
 msgid "By account"
 msgstr "按账户"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "Warn User"
 msgstr "警告用户"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:364
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:380
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3763,89 +3790,89 @@
 "\n"
 "这将增加 %s 的警告级别,他/她也将被迫遵守更加严格的速度限制。\n"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:389
 msgid "Warn _anonymously?"
 msgstr "匿名警告吗(_A)?"
 
-#: src/dialogs.c:395
+#: src/dialogs.c:396
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名警告较不容易引起注意。</b>"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:467
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:468
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:475
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: src/dialogs.c:480
+#: src/dialogs.c:481
 #, 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:482
+#: src/dialogs.c:483
 msgid "Remove Group"
 msgstr "删除组"
 
-#: src/dialogs.c:692
+#: src/dialogs.c:633
 msgid "New Message"
 msgstr "新消息"
 
-#: src/dialogs.c:710
+#: src/dialogs.c:651
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "您想要跟谁聊?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:726 src/dialogs.c:827 src/dialogs.c:3779
+#: src/dialogs.c:667 src/dialogs.c:768 src/dialogs.c:3725
 msgid "_Screenname:"
 msgstr "用户名(_S):"
 
-#: src/dialogs.c:741 src/dialogs.c:843 src/gtkpounce.c:518
+#: src/dialogs.c:682 src/dialogs.c:784 src/gtkpounce.c:520
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: src/dialogs.c:796
+#: src/dialogs.c:737
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:756
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "您想要查看谁的信息?请输入他/她的用户名。\n"
 
-#: src/dialogs.c:994
+#: src/dialogs.c:935
 msgid "Add Group"
 msgstr "添加组"
 
-#: src/dialogs.c:1011
+#: src/dialogs.c:952
 msgid "Please enter the name of the group to be added.\n"
 msgstr "请输入要添加的组名称。\n"
 
-#: src/dialogs.c:1020 src/dialogs.c:4327
+#: src/dialogs.c:961 src/dialogs.c:4273
 msgid "_Group:"
 msgstr "组(_G):"
 
-#: src/dialogs.c:1102
+#: src/dialogs.c:1043
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: src/dialogs.c:1121
+#: src/dialogs.c:1062
 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. "
@@ -3854,359 +3881,357 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: src/dialogs.c:1140
+#: src/dialogs.c:1081
 msgid "Screen Name"
 msgstr "用户名"
 
-#: src/dialogs.c:1153
+#: src/dialogs.c:1094
 msgid "Alias"
 msgstr "别名"
 
-#: src/dialogs.c:1163
+#: src/dialogs.c:1104
 msgid "Group"
 msgstr "组"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1172
+#: src/dialogs.c:1113
 msgid "Add To"
 msgstr "添加到"
 
-#: src/dialogs.c:1412
+#: src/dialogs.c:1346
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您目前登入的协议中没有一个可以聊天的。"
+
+#: src/dialogs.c:1353
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: src/dialogs.c:1435
+#: src/dialogs.c:1376
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: src/dialogs.c:1444
+#: src/dialogs.c:1385
 msgid "Account:"
 msgstr "账户:"
 
-#: src/dialogs.c:1463 src/multi.c:785
+#: src/dialogs.c:1404 src/multi.c:821
 msgid "Alias:"
 msgstr "别名:"
 
-#: src/dialogs.c:1474
+#: src/dialogs.c:1415
 msgid "Group:"
 msgstr "组:"
 
-#: src/dialogs.c:1807
+#: src/dialogs.c:1748
 msgid "Privacy"
 msgstr "隐私"
 
-#: src/dialogs.c:1818
+#: src/dialogs.c:1759
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1768
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: src/dialogs.c:1844
+#: src/dialogs.c:1785
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: src/dialogs.c:1848
+#: src/dialogs.c:1789
 msgid "Allow only users on my buddy list"
 msgstr "只允许我的好友联系我"
 
-#: src/dialogs.c:1852
+#: src/dialogs.c:1793
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: src/dialogs.c:1890
+#: src/dialogs.c:1831
 msgid "Deny all users"
 msgstr "拒绝所有用户"
 
-#: src/dialogs.c:1894
+#: src/dialogs.c:1835
 msgid "Block the users below"
 msgstr "屏蔽以下用户"
 
-#: src/dialogs.c:2009
+#: src/dialogs.c:1950
 msgid "Set Directory Info"
 msgstr "设置目录信息"
 
-#: src/dialogs.c:2017
+#: src/dialogs.c:1958
 msgid "Directory Info"
 msgstr "目录信息"
 
-#: src/dialogs.c:2027
+#: src/dialogs.c:1968
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "设置 %s 的目录信息:"
 
-#: src/dialogs.c:2039
+#: src/dialogs.c:1980
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许搜索引擎查找您的信息"
 
 #. Line 1
-#: src/dialogs.c:2042 src/dialogs.c:2684
+#: src/dialogs.c:1983 src/dialogs.c:2627
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:2053 src/dialogs.c:2694
+#: src/dialogs.c:1994 src/dialogs.c:2637
 msgid "Middle Name"
 msgstr "中名"
 
 #. Line 3
-#: src/dialogs.c:2065 src/dialogs.c:2704
+#: src/dialogs.c:2006 src/dialogs.c:2647
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:2076 src/dialogs.c:2714
+#: src/dialogs.c:2017 src/dialogs.c:2657
 msgid "Maiden Name"
 msgstr "娘家名"
 
 #. Line 6
-#: src/dialogs.c:2098 src/dialogs.c:2733
+#: src/dialogs.c:2039 src/dialogs.c:2676
 msgid "State"
 msgstr "州/省"
 
-#: src/dialogs.c:2140 src/dialogs.c:2311 src/dialogs.c:3448 src/dialogs.c:4248
-#: src/dialogs.c:4998
+#: src/dialogs.c:2081 src/dialogs.c:2254 src/dialogs.c:3394 src/dialogs.c:4194
+#: src/dialogs.c:4944
 msgid "Save"
 msgstr "保存"
 
-#: src/dialogs.c:2162
-msgid "New Passwords Do Not Match"
-msgstr "新密码不相同"
-
-#: src/dialogs.c:2167
-msgid "Fill out all fields completely"
-msgstr "完全填入所有字段"
-
-#: src/dialogs.c:2210
+#: src/dialogs.c:2104
+msgid "New passwords do not match."
+msgstr "新密码不相同。"
+
+#: src/dialogs.c:2110
+msgid "Fill out all fields completely."
+msgstr "完全填入所有字段。"
+
+#: src/dialogs.c:2153
 #, c-format
 msgid "Changing password for %s:"
 msgstr "更改 %s 的密码:"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2161
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:2229
+#: src/dialogs.c:2172
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:2240
+#: src/dialogs.c:2183
 msgid "New Password (again)"
 msgstr "再次输入新密码"
 
-#. Build OK Button
-#: src/dialogs.c:2251 src/dialogs.c:2383 src/dialogs.c:2665 src/dialogs.c:2811
-#: src/dialogs.c:3945 src/dialogs.c:4424 src/prpl.c:245
-msgid "OK"
-msgstr "确定"
-
-#: src/dialogs.c:2288
+#: src/dialogs.c:2231
 #, c-format
 msgid "Changing info for %s:"
 msgstr "更改 %s 的信息:"
 
-#: src/dialogs.c:2369
+#: src/dialogs.c:2312
 msgid "Below are the results of your search: "
 msgstr "下面是您搜索的结果:"
 
-#: src/dialogs.c:2477
+#: src/dialogs.c:2420
 msgid "Permit"
 msgstr "许可"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2452
 msgid "Add Permit"
 msgstr "添加许可"
 
-#: src/dialogs.c:2511
+#: src/dialogs.c:2454
 msgid "Add Deny"
 msgstr "添加拒绝"
 
-#: src/dialogs.c:2579
+#: src/dialogs.c:2522
 msgid "Log Conversation"
 msgstr "对话记录"
 
-#: src/dialogs.c:2660 src/dialogs.c:2793
+#: src/dialogs.c:2603 src/dialogs.c:2736
 msgid "Search for Buddy"
 msgstr "搜索好友"
 
-#: src/dialogs.c:2760
+#: src/dialogs.c:2703
 msgid "Find Buddy By Info"
 msgstr "按信息查找好友"
 
-#: src/dialogs.c:2787
+#: src/dialogs.c:2730
 msgid "Find Buddy By Email"
 msgstr "按电子邮件查找好友"
 
-#: src/dialogs.c:2891
+#: src/dialogs.c:2834
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: src/dialogs.c:2893
+#: src/dialogs.c:2836
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2912
+#: src/dialogs.c:2855
 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:3077 src/dialogs.c:3094
+#: src/dialogs.c:3020 src/dialogs.c:3037
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: src/dialogs.c:3125 src/dialogs.c:3142
+#: src/dialogs.c:3068 src/dialogs.c:3085
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: src/dialogs.c:3226 src/dialogs.c:3249
+#: src/dialogs.c:3169 src/dialogs.c:3192
 msgid "Select Font"
 msgstr "选择字体"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3314
+#: src/dialogs.c:3258
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能保存空标题的离开消息"
 
-#: src/dialogs.c:3315
+#: src/dialogs.c:3260
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "请给消息指定标题,或者不保存直接“使用”。"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3324
+#: src/dialogs.c:3270
 msgid "You cannot create an empty away message"
 msgstr "您不能创建空的离开消息"
 
-#: src/dialogs.c:3389 src/dialogs.c:3397
+#: src/dialogs.c:3335 src/dialogs.c:3343
 msgid "New away message"
 msgstr "新建离开消息"
 
-#: src/dialogs.c:3407
+#: src/dialogs.c:3353
 msgid "Away title: "
 msgstr "离开标题:"
 
-#: src/dialogs.c:3452
+#: src/dialogs.c:3398
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: src/dialogs.c:3456
+#: src/dialogs.c:3402
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3604
+#: src/dialogs.c:3550
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3650 src/dialogs.c:3728
+#: src/dialogs.c:3596 src/dialogs.c:3674
 msgid "Alias Buddy"
 msgstr "好友别名"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3679
+#: src/dialogs.c:3625
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "请输入此聊天的别名。\n"
 
-#: src/dialogs.c:3691 src/dialogs.c:3793
+#: src/dialogs.c:3637 src/dialogs.c:3739
 msgid "_Alias:"
 msgstr "别名(_A):"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3758
+#: src/dialogs.c:3704
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "请为以下好友输入别名,或者在好友列表中给该联系人改名。\n"
 
-#: src/dialogs.c:3847 src/dialogs.c:3854
+#: src/dialogs.c:3793 src/dialogs.c:3800
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "无法写入 %s。"
 
-#: src/dialogs.c:3878
+#: src/dialogs.c:3824
 msgid "Save Log File"
 msgstr "保存日志文件"
 
-#: src/dialogs.c:3908
+#: src/dialogs.c:3854
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "无法删除文件 %s。"
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3873
 msgid "Clear Log"
 msgstr "清除日志"
 
-#: src/dialogs.c:3936
+#: src/dialogs.c:3882
 msgid "Really clear log?"
 msgstr "真的要清除日志吗?"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:3927
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "无法打开日志文件 %s。"
 
-#: src/dialogs.c:4120
+#: src/dialogs.c:4066
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: src/dialogs.c:4122
+#: src/dialogs.c:4068
 msgid "System Log"
 msgstr "系统日志"
 
-#: src/dialogs.c:4143
+#: src/dialogs.c:4089
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "无法打开日志文件 %s"
 
-#: src/dialogs.c:4164
+#: src/dialogs.c:4110
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:4221
+#: src/dialogs.c:4167
 msgid "Log"
 msgstr "日志"
 
-#: src/dialogs.c:4243
+#: src/dialogs.c:4189
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:4301
+#: src/dialogs.c:4247
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:4318
+#: src/dialogs.c:4264
 msgid "Please enter a new name for the selected group.\n"
 msgstr "请输入选中组的新名字。\n"
 
-#: src/dialogs.c:4394 src/dialogs.c:4403
+#: src/dialogs.c:4340 src/dialogs.c:4349
 msgid "Rename Buddy"
 msgstr "重命名好友"
 
-#: src/dialogs.c:4410
+#: src/dialogs.c:4356
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/ft.c:130
+#: src/ft.c:135
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: src/ft.c:144
+#: src/ft.c:149
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 未找到。\n"
 
-#: src/ft.c:738
+#: src/ft.c:741
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "您中止了给 %s 的文件传送。\n"
 
-#: src/ft.c:740
+#: src/ft.c:743
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 中止了给您的文件传送。\n"
@@ -4293,173 +4318,173 @@
 "关闭 Gaim 的运行副本\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:50
+#: src/gaimrc.c:52
 msgid "sorry, i ran out for a while. bbl"
 msgstr "烦着呢,别理我"
 
-#: src/gaimrc.c:292 src/gaimrc.c:325 src/gaimrc.c:1451
+#: src/gaimrc.c:294 src/gaimrc.c:327 src/gaimrc.c:1453
 msgid "boring default"
 msgstr "烦死我了"
 
-#: src/gaimrc.c:1549
+#: src/gaimrc.c:1551
 #, c-format
 msgid "Could not open config file %s."
 msgstr "无法打开配置文件 %s。"
 
-#: src/gaimrc.c:1606
+#: src/gaimrc.c:1609
 msgid "Unable to Save Preferences"
 msgstr "无法保存首选项"
 
-#: src/gaimrc.c:1606
+#: src/gaimrc.c:1610
 msgid ""
-"Gaim was unable to save your preferences.  Please verify that you have "
-"enough free space."
+"Gaim was unable to save your preferences. Please verify that you have enough "
+"free space."
 msgstr "Gaim 无法保存您的首选项。请检查您是否有足够的剩余空间。"
 
-#: src/gtkblist.c:392
+#: src/gtkblist.c:398
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: src/gtkblist.c:393
+#: src/gtkblist.c:399
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: src/gtkblist.c:394
+#: src/gtkblist.c:400
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: src/gtkblist.c:395
+#: src/gtkblist.c:401
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:397
+#: src/gtkblist.c:403
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:398 src/gtkblist.c:429
+#: src/gtkblist.c:404 src/gtkblist.c:435
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: src/gtkblist.c:399 src/gtkblist.c:430
+#: src/gtkblist.c:405 src/gtkblist.c:436
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: src/gtkblist.c:408
+#: src/gtkblist.c:414
 msgid "_Get Info"
 msgstr "获取信息(_G)"
 
-#: src/gtkblist.c:410
+#: src/gtkblist.c:416
 msgid "_IM"
 msgstr "开聊(_I)"
 
-#: src/gtkblist.c:411
+#: src/gtkblist.c:417
 msgid "Add Buddy _Pounce"
 msgstr "添加好友千里眼(_P)"
 
-#: src/gtkblist.c:412
+#: src/gtkblist.c:418
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:743
+#: src/gtkblist.c:749
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:744
+#: src/gtkblist.c:750
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友(B)/新即时消息(_I)..."
 
-#: src/gtkblist.c:745
+#: src/gtkblist.c:751
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: src/gtkblist.c:746
+#: src/gtkblist.c:752
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友(B)/获取用户信息(_U)..."
 
-#: src/gtkblist.c:748
+#: src/gtkblist.c:754
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: src/gtkblist.c:749
+#: src/gtkblist.c:755
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:756
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: src/gtkblist.c:751
+#: src/gtkblist.c:757
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: src/gtkblist.c:752
+#: src/gtkblist.c:758
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: src/gtkblist.c:754
+#: src/gtkblist.c:760
 msgid "/Buddies/_Signoff"
 msgstr "/好友(B)/登出(_S)"
 
-#: src/gtkblist.c:755
+#: src/gtkblist.c:761
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Tools
-#: src/gtkblist.c:758
+#: src/gtkblist.c:764
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/gtkblist.c:759
+#: src/gtkblist.c:765
 msgid "/Tools/_Away"
 msgstr "/工具(T)/离开(_A)"
 
-#: src/gtkblist.c:760
+#: src/gtkblist.c:766
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: src/gtkblist.c:761
+#: src/gtkblist.c:767
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具(T)/协议操作(_R)"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:769
 msgid "/Tools/A_ccounts..."
 msgstr "/工具(T)/账户(_C)..."
 
-#: src/gtkblist.c:764
+#: src/gtkblist.c:770
 msgid "/Tools/_File Transfers..."
 msgstr "/工具(T)/文件传送(_F)..."
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:771
 msgid "/Tools/Preferences..."
 msgstr "/工具(T)/首选项..."
 
-#: src/gtkblist.c:766
+#: src/gtkblist.c:772
 msgid "/Tools/Pr_ivacy..."
 msgstr "/工具(T)/隐私(_I)..."
 
-#: src/gtkblist.c:768
+#: src/gtkblist.c:774
 msgid "/Tools/View System _Log..."
 msgstr "/工具(T)/查看系统日志(_L)..."
 
 #. Help
-#: src/gtkblist.c:771
+#: src/gtkblist.c:777
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/gtkblist.c:772
+#: src/gtkblist.c:778
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: src/gtkblist.c:773
+#: src/gtkblist.c:779
 msgid "/Help/_Debug Window..."
 msgstr "/帮助(H)/调试窗口(_D)..."
 
-#: src/gtkblist.c:774
+#: src/gtkblist.c:780
 msgid "/Help/_About..."
 msgstr "/帮助(H)/关于(_A)..."
 
-#: src/gtkblist.c:808
+#: src/gtkblist.c:814
 #, c-format
 msgid ""
 "\n"
@@ -4468,12 +4493,12 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: src/gtkblist.c:867
+#: src/gtkblist.c:873
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:881
+#: src/gtkblist.c:887
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4481,7 +4506,7 @@
 "\n"
 "<b>账户:</b>"
 
-#: src/gtkblist.c:882
+#: src/gtkblist.c:888
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4489,7 +4514,7 @@
 "\n"
 "<b>别名:</b>"
 
-#: src/gtkblist.c:883
+#: src/gtkblist.c:889
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4497,7 +4522,7 @@
 "\n"
 "<b>昵称:</b>"
 
-#: src/gtkblist.c:884
+#: src/gtkblist.c:890
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4505,7 +4530,7 @@
 "\n"
 "<b>瞌睡:</b>"
 
-#: src/gtkblist.c:885
+#: src/gtkblist.c:891
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4513,7 +4538,7 @@
 "\n"
 "<b>警告:</b>"
 
-#: src/gtkblist.c:887
+#: src/gtkblist.c:893
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4521,421 +4546,446 @@
 "\n"
 "<b>描述:</b>健谈"
 
-#: src/gtkblist.c:1179
+#: src/gtkblist.c:894
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+"\n"
+"<b>状态</b>:可怕"
+
+#: src/gtkblist.c:1186
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "瞌睡中 (%d小时%02d分) "
 
-#: src/gtkblist.c:1181
+#: src/gtkblist.c:1188
 #, c-format
 msgid "Idle (%dm) "
 msgstr "瞌睡中 (%d分) "
 
-#: src/gtkblist.c:1185
+#: src/gtkblist.c:1192
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%) "
 
-#: src/gtkblist.c:1351 src/prefs.c:1809
+#: src/gtkblist.c:1329 src/gtkblist.c:1333 src/gtkprefs.c:604
+#: src/gtkprefs.c:1110
+msgid "None"
+msgstr "无"
+
+#: src/gtkblist.c:1330
+msgid "Alphabetical"
+msgstr "字母序"
+
+#: src/gtkblist.c:1331
+msgid "By status"
+msgstr "按状态"
+
+#: src/gtkblist.c:1332
+msgid "By log size"
+msgstr "按日志大小"
+
+#: src/gtkblist.c:1358 src/gtkprefs.c:1810
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: src/gtkblist.c:1375
+#: src/gtkblist.c:1382
 msgid "/Tools/Away"
 msgstr "/工具(T)/离开(A)"
 
-#: src/gtkblist.c:1378
+#: src/gtkblist.c:1385
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具(T)/好友千里眼(P)"
 
-#: src/gtkblist.c:1381
+#: src/gtkblist.c:1388
 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:1464
+#: src/gtkblist.c:1471
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: src/gtkblist.c:1466
+#: src/gtkblist.c:1473
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: src/gtkblist.c:1484 src/gtkconv.c:765
+#: src/gtkblist.c:1491 src/gtkconv.c:766
 msgid "IM"
 msgstr "开聊"
 
-#: src/gtkblist.c:1490
+#: src/gtkblist.c:1497
 msgid "Send a message to the selected buddy"
 msgstr "向选中好友发送消息"
 
-#: src/gtkblist.c:1499
+#: src/gtkblist.c:1506
 msgid "Get information on the selected buddy"
 msgstr "获取选中好友的信息"
 
-#: src/gtkblist.c:1507
+#: src/gtkblist.c:1514
 msgid "Join a chat room"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:1515
+#: src/gtkblist.c:1522
 msgid "Set an away message"
 msgstr "设置离开消息"
 
-#: src/gtkconv.c:218
+#: src/gtkconv.c:219
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入图像"
 
-#: src/gtkconv.c:773
+#: src/gtkconv.c:774
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: src/gtkconv.c:775 src/prefs.c:541
+#: src/gtkconv.c:776 src/gtkprefs.c:542
 msgid "Ignore"
 msgstr "忽略"
 
 #. Info button
-#: src/gtkconv.c:784 src/gtkconv.c:2668
+#: src/gtkconv.c:785 src/gtkconv.c:2669
 msgid "Info"
 msgstr "信息"
 
-#: src/gtkconv.c:804 src/gtkconv.c:2651 src/gtkconv.c:3782
+#: src/gtkconv.c:805 src/gtkconv.c:2652 src/gtkconv.c:3781
 msgid "Remove"
 msgstr "删除"
 
-#: src/gtkconv.c:878
+#: src/gtkconv.c:879
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:906
+#: src/gtkconv.c:907
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: src/gtkconv.c:927
+#: src/gtkconv.c:928
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:947
+#: src/gtkconv.c:948
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: src/gtkconv.c:1976
+#: src/gtkconv.c:1977
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: src/gtkconv.c:1984
+#: src/gtkconv.c:1985
 msgid "User has typed something and paused"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2091
+#: src/gtkconv.c:2092
 msgid "_Send As"
 msgstr "发送身份(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:2541
+#: src/gtkconv.c:2542
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2543
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2545
 msgid "/Conversation/View _Log..."
 msgstr "/对话(C)/查看日志(_L)..."
 
-#: src/gtkconv.c:2546
+#: src/gtkconv.c:2547
 msgid "/Conversation/Insert _URL..."
 msgstr "/对话(C)/插入 URL(_U)..."
 
-#: src/gtkconv.c:2548
+#: src/gtkconv.c:2549
 msgid "/Conversation/Insert _Image..."
 msgstr "/对话(C)/插入图像(_I)..."
 
-#: src/gtkconv.c:2551
+#: src/gtkconv.c:2552
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2556
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2557
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2558
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: src/gtkconv.c:2593
+#: src/gtkconv.c:2594
 msgid "/Conversation/View Log..."
 msgstr "/对话(C)/查看日志(L)..."
 
-#: src/gtkconv.c:2595
+#: src/gtkconv.c:2596
 msgid "/Conversation/Insert URL..."
 msgstr "/对话(C)/插入 URL(U)..."
 
-#: src/gtkconv.c:2597
+#: src/gtkconv.c:2598
 msgid "/Conversation/Insert Image..."
 msgstr "/对话(C)/插入图像(I)..."
 
-#: src/gtkconv.c:2599
+#: src/gtkconv.c:2600
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: src/gtkconv.c:2601
+#: src/gtkconv.c:2602
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2625 src/gtkconv.c:2627 src/gtkconv.c:2725 src/gtkconv.c:2727
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:2626 src/gtkconv.c:2628 src/gtkconv.c:2726 src/gtkconv.c:2728
+#: src/gtkconv.c:5025
 msgid "Send"
 msgstr "发送"
 
-#: src/gtkconv.c:2648 src/gtkconv.c:3794
+#: src/gtkconv.c:2649 src/gtkconv.c:3793
 msgid "Add the user to your buddy list"
 msgstr "将用户加为好友"
 
-#: src/gtkconv.c:2654 src/gtkconv.c:3785
+#: src/gtkconv.c:2655 src/gtkconv.c:3784
 msgid "Remove the user from your buddy list"
 msgstr "从您的好友列表中删除该用户"
 
 #. Warn button
-#: src/gtkconv.c:2661
+#: src/gtkconv.c:2662
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2665
+#: src/gtkconv.c:2666
 msgid "Warn the user"
 msgstr "警告用户"
 
-#: src/gtkconv.c:2672 src/gtkconv.c:3103
+#: src/gtkconv.c:2673 src/gtkconv.c:3104
 msgid "Get the user's information"
 msgstr "获取用户信息"
 
 #. Block button
-#: src/gtkconv.c:2675
+#: src/gtkconv.c:2676
 msgid "Block"
 msgstr "屏蔽"
 
-#: src/gtkconv.c:2679
+#: src/gtkconv.c:2680
 msgid "Block the user"
 msgstr "屏蔽用户"
 
 #. Invite
-#: src/gtkconv.c:2737 src/gtkconv.c:5025
+#: src/gtkconv.c:2738 src/gtkconv.c:5028
 msgid "Invite"
 msgstr "邀请"
 
-#: src/gtkconv.c:2740
+#: src/gtkconv.c:2741
 msgid "Invite a user"
 msgstr "邀请用户"
 
-#: src/gtkconv.c:2779
+#: src/gtkconv.c:2780
 msgid "Bold"
 msgstr "粗体"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2791
 msgid "Italic"
 msgstr "斜体"
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2802
 msgid "Underline"
 msgstr "下划线"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2818
 msgid "Larger font size"
 msgstr "较大字体"
 
-#: src/gtkconv.c:2829
+#: src/gtkconv.c:2830
 msgid "Normal font size"
 msgstr "标准字体"
 
-#: src/gtkconv.c:2841
+#: src/gtkconv.c:2842
 msgid "Smaller font size"
 msgstr "较小字体"
 
-#: src/gtkconv.c:2858
+#: src/gtkconv.c:2859
 msgid "Font Face"
 msgstr "字体"
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2871
 msgid "Foreground font color"
 msgstr "字体颜色"
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2883
 msgid "Background color"
 msgstr "背景颜色"
 
-#: src/gtkconv.c:2897
+#: src/gtkconv.c:2898
 msgid "Insert image"
 msgstr "插入图像"
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2909
 msgid "Insert link"
 msgstr "插入链接"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2920
 msgid "Insert smiley"
 msgstr "插入笑脸"
 
-#: src/gtkconv.c:2976
+#: src/gtkconv.c:2977
 msgid "Topic:"
 msgstr "话题:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3023
+#: src/gtkconv.c:3024
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: src/gtkconv.c:3080
+#: src/gtkconv.c:3081
 msgid "IM the user"
 msgstr "给用户发送即时消息"
 
-#: src/gtkconv.c:3092
+#: src/gtkconv.c:3093
 msgid "Ignore the user"
 msgstr "忽略用户"
 
-#: src/gtkconv.c:3623
+#: src/gtkconv.c:3622
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: src/gtkconv.c:4228 src/gtkconv.c:4350
+#: src/gtkconv.c:4227 src/gtkconv.c:4349
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: src/gtkconv.c:4710
+#: src/gtkconv.c:4709
 msgid "Disable Animation"
 msgstr "禁用动画"
 
-#: src/gtkconv.c:4719
+#: src/gtkconv.c:4718
 msgid "Enable Animation"
 msgstr "启用动画"
 
-#: src/gtkconv.c:4726
+#: src/gtkconv.c:4725
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: src/gtkconv.c:4732
+#: src/gtkconv.c:4731
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: src/gtkft.c:103
+#: src/gtkft.c:104
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: src/gtkft.c:106
+#: src/gtkft.c:107
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/gtkft.c:143
+#: src/gtkft.c:144
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/秒"
 
-#: src/gtkft.c:218
+#: src/gtkft.c:219
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:222
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:446
 msgid "Progress"
 msgstr "进度"
 
-#: src/gtkft.c:452
+#: src/gtkft.c:453
 msgid "Filename"
 msgstr "文件名"
 
-#: src/gtkft.c:459
+#: src/gtkft.c:460
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:466
+#: src/gtkft.c:467
 msgid "Remaining"
 msgstr "剩余"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:497
 msgid "Filename:"
 msgstr "文件名:"
 
-#: src/gtkft.c:497
+#: src/gtkft.c:498
 msgid "Status:"
 msgstr "状态:"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:499
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:499
-msgid "Time Elapsed:"
-msgstr "已过时间:"
-
 #: src/gtkft.c:500
+msgid "Time Elapsed:"
+msgstr "已过时间:"
+
+#: src/gtkft.c:501
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: src/gtkft.c:566
+#: src/gtkft.c:567
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: src/gtkft.c:595
+#: src/gtkft.c:596
 msgid "_Keep the dialog open"
 msgstr "保持对话框打开(_K)"
 
-#: src/gtkft.c:605
+#: src/gtkft.c:606
 msgid "_Clear finished transfers"
 msgstr "清除未完成的传送(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:614
+#: src/gtkft.c:615
 msgid "Show download details"
 msgstr "显示下载细节"
 
-#: src/gtkft.c:615
+#: src/gtkft.c:616
 msgid "Hide download details"
 msgstr "隐藏下载细节"
 
 #. Pause button
-#: src/gtkft.c:657
+#: src/gtkft.c:658
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: src/gtkft.c:667
+#: src/gtkft.c:668
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: src/gtkft.c:1009
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "文件不存在。"
 
-#: src/gtkft.c:1016
-msgid "Can not send a file of 0 bytes."
+#: src/gtkft.c:1018
+msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: src/gtkft.c:1028
+#: src/gtkft.c:1030
 msgid "That file already exists. Would you like to overwrite it?"
 msgstr "该文件已存在。您是否想要覆盖?"
 
-#: src/gtkft.c:1054
+#: src/gtkft.c:1056
 msgid "Gaim - Open..."
 msgstr "Gaim - 打开..."
 
-#: src/gtkft.c:1103
+#: src/gtkft.c:1105
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
@@ -4967,975 +5017,622 @@
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: src/gtkpounce.c:121
+#: src/gtkpounce.c:122
 msgid "Select a file"
 msgstr "选择文件"
 
-#: src/gtkpounce.c:170
+#: src/gtkpounce.c:172
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#: src/gtkpounce.c:342
+#: src/gtkpounce.c:344
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 开始向您打字"
 
-#: src/gtkpounce.c:343
+#: src/gtkpounce.c:345
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已登入"
 
-#: src/gtkpounce.c:344
+#: src/gtkpounce.c:346
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 睡醒了"
 
-#: src/gtkpounce.c:345
+#: src/gtkpounce.c:347
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 回来了"
 
-#: src/gtkpounce.c:346
+#: src/gtkpounce.c:348
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止了给您打字"
 
-#: src/gtkpounce.c:347
+#: src/gtkpounce.c:349
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已登出"
 
-#: src/gtkpounce.c:348
+#: src/gtkpounce.c:350
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 打起瞌睡"
 
-#: src/gtkpounce.c:349
+#: src/gtkpounce.c:351
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 走了。"
 
-#: src/gtkpounce.c:350
+#: src/gtkpounce.c:352
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:493 src/gtkpounce.c:883
+#: src/gtkpounce.c:495 src/gtkpounce.c:885
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:511
+#: src/gtkpounce.c:513
 msgid "Pounce Who"
 msgstr "监视对象"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:535
 msgid "_Buddy Name:"
 msgstr "好友(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:552
+#: src/gtkpounce.c:554
 msgid "Pounce When"
 msgstr "监视的事件"
 
-#: src/gtkpounce.c:560
+#: src/gtkpounce.c:562
 msgid "Sign on"
 msgstr "登入"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:564
 msgid "Sign off"
 msgstr "登出"
 
-#: src/gtkpounce.c:566
+#: src/gtkpounce.c:568
 msgid "Return from away"
 msgstr "回来"
 
-#: src/gtkpounce.c:570
+#: src/gtkpounce.c:572
 msgid "Return from idle"
 msgstr "睡醒了"
 
-#: src/gtkpounce.c:572
+#: src/gtkpounce.c:574
 msgid "Buddy starts typing"
 msgstr "好友开始打字"
 
-#: src/gtkpounce.c:574
+#: src/gtkpounce.c:576
 msgid "Buddy stops typing"
 msgstr "好友停止打字"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:603
+#: src/gtkpounce.c:605
 msgid "Pounce Action"
 msgstr "采取操作"
 
-#: src/gtkpounce.c:610
+#: src/gtkpounce.c:612
 msgid "Open an IM window"
 msgstr "打开即时消息窗口"
 
-#: src/gtkpounce.c:611
-msgid "Popup notification"
-msgstr "弹出通知"
-
-#: src/gtkpounce.c:612
-msgid "Send a message"
-msgstr "发送消息"
-
 #: src/gtkpounce.c:613
+msgid "Popup notification"
+msgstr "弹出通知"
+
+#: src/gtkpounce.c:614
+msgid "Send a message"
+msgstr "发送消息"
+
+#: src/gtkpounce.c:615
 msgid "Execute a command"
 msgstr "执行命令"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:616
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: src/gtkpounce.c:618 src/gtkpounce.c:620 src/multi.c:678
+#: src/gtkpounce.c:620 src/gtkpounce.c:622 src/multi.c:714
 msgid "Browse"
 msgstr "浏览"
 
-#: src/gtkpounce.c:621 src/prefs.c:1636
+#: src/gtkpounce.c:623 src/gtkprefs.c:1637
 msgid "Test"
 msgstr "测试"
 
-#: src/gtkpounce.c:704
+#: src/gtkpounce.c:706
 msgid "_Save this pounce after activation"
 msgstr "激活后保存此千里眼(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:890
+#: src/gtkpounce.c:892
 msgid "Remove Buddy Pounce"
 msgstr "删除好友千里眼"
 
-#: src/gtkutils.c:318
-msgid "Gaim - Save Icon"
-msgstr "Gaim - 保存图标"
-
-#: src/html.c:326
-msgid "g003: Error opening connection.\n"
-msgstr "g003:打开连接出错。\n"
-
-#: src/log.c:118
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 保存对话"
-
-#: src/log.c:159 src/log.c:180 src/log.c:193
-#, c-format
-msgid "Unable to make directory %s for logging"
-msgstr "无法建立日志目录 %s"
-
-#: src/log.c:247 src/log.c:263
-#, c-format
-msgid "IM Sessions with %s\n"
-msgstr "与 %s 的即时消息会话\n"
-
-#: src/log.c:250 src/log.c:266
-#, c-format
-msgid "IM Sessions with %s"
-msgstr "与 %s 的即时消息会话"
-
-#: src/log.c:297
-#, c-format
-msgid "+++ %s (%s) signed on @ %s"
-msgstr "+++ %s (%s) 登入了 @ %s"
-
-#: src/log.c:302
-#, c-format
-msgid "+++ %s (%s) signed off @ %s"
-msgstr "+++ %s (%s) 登出了 @ %s"
-
-#: src/log.c:307
-#, c-format
-msgid "+++ %s (%s) changed away state @ %s"
-msgstr "+++ %s (%s) 更改了离开状态 @ %s"
-
-#: src/log.c:312
-#, c-format
-msgid "+++ %s (%s) came back @ %s"
-msgstr "+++ %s (%s) 回来了 @ %s"
-
-#: src/log.c:317
-#, c-format
-msgid "+++ %s (%s) became idle @ %s"
-msgstr "+++ %s (%s) 睡着了 @ %s"
-
-#: src/log.c:322
-#, c-format
-msgid "+++ %s (%s) returned from idle @ %s"
-msgstr "+++ %s (%s) 睡醒了 @ %s"
-
-#: src/log.c:327
-#, c-format
-msgid "+++ Program exit @ %s"
-msgstr "+++ 程序退出 @ %s"
-
-#: src/log.c:334
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed on @ %s"
-msgstr "%s (%s) 报告 %s (%s) 登入了 @ %s"
-
-#: src/log.c:339
-#, c-format
-msgid "%s (%s) reported that %s (%s) signed off @ %s"
-msgstr "%s (%s) 报告 %s (%s) 登出了 @ %s"
-
-#: src/log.c:344
-#, c-format
-msgid "%s (%s) reported that %s (%s) went away @ %s"
-msgstr "%s (%s) 报告 %s (%s) 离开了 @ %s"
-
-#: src/log.c:349
-#, c-format
-msgid "%s (%s) reported that %s (%s) came back @ %s"
-msgstr "%s (%s) 报告 %s (%s) 回来了 @ %s"
-
-#: src/log.c:354
-#, c-format
-msgid "%s (%s) reported that %s (%s) became idle @ %s"
-msgstr "%s (%s) 报告 %s (%s) 睡着了 @ %s"
-
-#: src/log.c:360
-#, c-format
-msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
-msgstr "%s (%s) 报告 %s (%s) 睡醒了 @ %s"
-
-#: src/log.c:372
-#, c-format
-msgid "%s (%s) reported that %s signed on @ %s"
-msgstr "%s (%s) 报告 %s 登入了 @ %s"
-
-#: src/log.c:377
-#, c-format
-msgid "%s (%s) reported that %s signed off @ %s"
-msgstr "%s (%s) 报告 %s 登出了 @ %s"
-
-#: src/log.c:382
-#, c-format
-msgid "%s (%s) reported that %s went away @ %s"
-msgstr "%s (%s) 报告 %s 离开了 @ %s"
-
-#: src/log.c:387
-#, c-format
-msgid "%s (%s) reported that %s came back @ %s"
-msgstr "%s (%s) 报告 %s 回来了 @ %s"
-
-#: src/log.c:392
-#, c-format
-msgid "%s (%s) reported that %s became idle @ %s"
-msgstr "%s (%s) 报告 %s 睡着了 @ %s"
-
-#: src/log.c:398
-#, c-format
-msgid "%s (%s) reported that %s returned from idle @ %s"
-msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
-
-#: src/main.c:181
-msgid "Please enter your login."
-msgstr "请输入您的登录名。"
-
-#: src/main.c:270
-msgid "<New User>"
-msgstr "<新用户>"
-
-#: src/main.c:312
-msgid "Login"
-msgstr "登入"
-
-#: src/main.c:328
-msgid "Screen Name:"
-msgstr "用户名:"
-
-#. And now for the buttons
-#: src/main.c:362
-msgid "Accounts"
-msgstr "账户"
-
-#: src/main.c:372 src/prefs.c:1876 src/win32/systray.c:355
-msgid "Preferences"
-msgstr "首选项"
-
-#: src/main.c:378 src/win32/systray.c:191
-msgid "Sign On"
-msgstr "登入"
-
-#: src/multi.c:264
-msgid "Screenname"
-msgstr "用户名"
-
-#: src/multi.c:292
-msgid "Protocol"
-msgstr "协议"
-
-#: src/multi.c:621
-msgid "Load Buddy Icon"
-msgstr "装入好友图标"
-
-#: src/multi.c:665
-msgid "Buddy Icon File:"
-msgstr "好友图标文件:"
-
-#: src/multi.c:684 src/prefs.c:1640
-msgid "Reset"
-msgstr "重置"
-
-#: src/multi.c:711
-msgid "Login Options"
-msgstr "登入选项"
-
-#: src/multi.c:723
-msgid "Protocol:"
-msgstr "协议:"
-
-#: src/multi.c:738
-msgid "Screenname:"
-msgstr "用户名:"
-
-#: src/multi.c:793
-msgid "Remember Password"
-msgstr "记住密码"
-
-#: src/multi.c:794
-msgid "Auto-Login"
-msgstr "自动登入"
-
-#: src/multi.c:851
-msgid "User Options"
-msgstr "用户选项"
-
-#: src/multi.c:861
-msgid "New Mail Notifications"
-msgstr "新邮件通知"
-
-#: src/multi.c:922
-#, c-format
-msgid "%s Options"
-msgstr "%s 选项"
-
-#: src/multi.c:966
-msgid "Register with server"
-msgstr "注册服务器"
-
-#: src/multi.c:999
-msgid "Proxy Options"
-msgstr "代理选项"
-
-#: src/multi.c:1013
-msgid "Proxy _Type"
-msgstr "代理类型(_T)"
-
-#: src/multi.c:1022
-msgid "Use Global Proxy Settings"
-msgstr "使用全局代理设置"
-
-#: src/multi.c:1031
-msgid "No Proxy"
-msgstr "无代理"
-
-#: src/multi.c:1083
-msgid "_Host:"
-msgstr "主机(_H):"
-
-#: src/multi.c:1119
-msgid "_User:"
-msgstr "用户名(_U):"
-
-#: src/multi.c:1135
-msgid "Pa_ssword:"
-msgstr "密码(_S):"
-
-#: src/multi.c:1209
-msgid "Modify Account"
-msgstr "修改账户"
-
-#: src/multi.c:1228
-msgid "Show more options"
-msgstr "显示全部选项"
-
-#: src/multi.c:1228
-msgid "Show fewer options"
-msgstr "显示主要选项"
-
-#: src/multi.c:1339
-msgid "_Login"
-msgstr "登入(_L)"
-
-#: src/multi.c:1357
-#, c-format
-msgid ""
-"Please enter your password for %s.\n"
-"\n"
-msgstr ""
-"请输入您作为 %s 的密码。\n"
-"\n"
-
-#: src/multi.c:1368
-msgid "_Password"
-msgstr "密码(_P)"
-
-#: src/multi.c:1419
-msgid "TOC not found."
-msgstr "TOC 未找到。"
-
-#: src/multi.c:1420
-msgid ""
-"You have attempted to login an IM account using the TOC protocol.  Because "
-"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
-"default.  To login, edit this account to use OSCAR or load the TOC plugin."
-msgstr ""
-"您试图使用 TOC 协议登入即时通讯账户。由于此协议优先于 OSCAR,所以该协议现在默"
-"认被编译为插件。如果要登入的话,请编辑此账户使用 OSCAR 或者装入 TOC 插件。"
-
-#: src/multi.c:1426
-msgid "Protocol not found."
-msgstr "协议未找到。"
-
-#: src/multi.c:1427
-msgid ""
-"You cannot log this account in; you do not have the protocol it uses loaded, "
-"or the protocol does not have a login function."
-msgstr ""
-"您无法登入此账户;您没有装入该账户所使用的协议,或者该协议未提供登录功能。"
-
-#: src/multi.c:1506
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "您真的想要删除 %s 吗?"
-
-#: src/multi.c:1507
-msgid "Delete"
-msgstr "删除"
-
-#: src/multi.c:1536
-msgid "Account Editor"
-msgstr "账户编辑器"
-
-#: src/multi.c:1575
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: src/multi.c:1625
-msgid "Done."
-msgstr "完成。"
-
-#: src/multi.c:1861
-msgid "Signon: "
-msgstr "登入:"
-
-#: src/multi.c:1920
-msgid "Signon"
-msgstr "登入"
-
-#: src/multi.c:1932
-msgid "Cancel All"
-msgstr "全部取消"
-
-#: src/multi.c:1987
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s:%s"
-
-#: src/multi.c:2009
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s 无法登入"
-
-#: src/multi.c:2010
-msgid "Signon Error"
-msgstr "登入出错"
-
-#: src/multi.c:2021
-msgid "Notice"
-msgstr "注意"
-
-#: src/multi.c:2033
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 已经登出"
-
-#: src/multi.c:2034
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: src/prefs.c:205
+#: src/gtkprefs.c:206
 msgid "Interface Options"
 msgstr "界面选项"
 
-#: src/prefs.c:207
+#: src/gtkprefs.c:208
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "如果未设置别名则显示远程昵称(_I)"
 
-#: src/prefs.c:388
+#: src/gtkprefs.c:389
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: src/prefs.c:421
+#: src/gtkprefs.c:422
 msgid "Icon"
 msgstr "图标"
 
-#: src/prefs.c:455
+#: src/gtkprefs.c:456
 msgid "Style"
 msgstr "样式"
 
-#: src/prefs.c:456
+#: src/gtkprefs.c:457
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: src/prefs.c:457
+#: src/gtkprefs.c:458
 msgid "_Italics"
 msgstr "斜体(_I)"
 
-#: src/prefs.c:458
+#: src/gtkprefs.c:459
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: src/prefs.c:459
+#: src/gtkprefs.c:460
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: src/prefs.c:461
+#: src/gtkprefs.c:462
 msgid "Face"
 msgstr "字体"
 
-#: src/prefs.c:464
+#: src/gtkprefs.c:465
 msgid "Use custo_m face"
 msgstr "使用自定义字体(_M)"
 
-#: src/prefs.c:478
+#: src/gtkprefs.c:479
 msgid "Use custom si_ze"
 msgstr "使用自定义大小(_Z)"
 
-#: src/prefs.c:486
+#: src/gtkprefs.c:487
 msgid "Color"
 msgstr "颜色"
 
-#: src/prefs.c:491
+#: src/gtkprefs.c:492
 msgid "_Text color"
 msgstr "文字颜色(_T)"
 
-#: src/prefs.c:508
+#: src/gtkprefs.c:509
 msgid "Bac_kground color"
 msgstr "背景颜色(_K)"
 
-#: src/prefs.c:534 src/prefs.c:695 src/prefs.c:736
+#: src/gtkprefs.c:535 src/gtkprefs.c:696 src/gtkprefs.c:737
 msgid "Display"
 msgstr "显示"
 
-#: src/prefs.c:535
+#: src/gtkprefs.c:536
 msgid "Show graphical _smileys"
 msgstr "显示图形化笑脸(_S)"
 
-#: src/prefs.c:536
+#: src/gtkprefs.c:537
 msgid "Show _timestamp on messages"
 msgstr "消息显示时间戳(_T)"
 
-#: src/prefs.c:537
+#: src/gtkprefs.c:538
 msgid "Show _URLs as links"
 msgstr "将 URLs 显示为链接(_U)"
 
-#: src/prefs.c:539
+#: src/gtkprefs.c:540
 msgid "_Highlight misspelled words"
 msgstr "突出显示拼错的单词(_H)"
 
-#: src/prefs.c:542
+#: src/gtkprefs.c:543
 msgid "Ignore c_olors"
 msgstr "忽略颜色(_O)"
 
-#: src/prefs.c:543
+#: src/gtkprefs.c:544
 msgid "Ignore font _faces"
 msgstr "忽略字体名称(_F)"
 
-#: src/prefs.c:544
+#: src/gtkprefs.c:545
 msgid "Ignore font si_zes"
 msgstr "忽略字体大小(_Z)"
 
-#: src/prefs.c:556
+#: src/gtkprefs.c:557
 msgid "Send Message"
 msgstr "发送消息"
 
-#: src/prefs.c:557
+#: src/gtkprefs.c:558
 msgid "_Enter sends message"
 msgstr "回车键发送消息(_E)"
 
-#: src/prefs.c:558
+#: src/gtkprefs.c:559
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+回车键发送消息(_O)"
 
-#: src/prefs.c:560
+#: src/gtkprefs.c:561
 msgid "Window Closing"
 msgstr "窗口关闭"
 
-#: src/prefs.c:561
+#: src/gtkprefs.c:562
 msgid "E_scape closes window"
 msgstr "Esc 键关闭窗口(_S)"
 
-#: src/prefs.c:562
+#: src/gtkprefs.c:563
 msgid "Control-_W closes window"
 msgstr "Ctrl+W 键关闭窗口(_W)"
 
-#: src/prefs.c:565
+#: src/gtkprefs.c:565
+msgid "Insertions"
+msgstr "插入"
+
+#: src/gtkprefs.c:566
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U/S} 插入 HTML 标签(_H)"
 
-#: src/prefs.c:566
+#: src/gtkprefs.c:567
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl+数字键插入笑脸(_S)"
 
-#: src/prefs.c:584
+#: src/gtkprefs.c:585
 msgid "Buddy List Sorting"
 msgstr "好友列表排序"
 
-#: src/prefs.c:593
+#: src/gtkprefs.c:594
 msgid "Sorting:"
 msgstr "排序:"
 
-#: src/prefs.c:598
+#: src/gtkprefs.c:599
 msgid "Buddy List Toolbar"
 msgstr "好友列表工具栏"
 
-#: src/prefs.c:599 src/prefs.c:678 src/prefs.c:721
+#: src/gtkprefs.c:600 src/gtkprefs.c:679 src/gtkprefs.c:722
 msgid "Show _buttons as:"
 msgstr "将按钮显示为(_B):"
 
-#: src/prefs.c:600 src/prefs.c:679 src/prefs.c:722
+#: src/gtkprefs.c:601 src/gtkprefs.c:680 src/gtkprefs.c:723
 msgid "Pictures"
 msgstr "图片"
 
-#: src/prefs.c:601 src/prefs.c:680 src/prefs.c:723
+#: src/gtkprefs.c:602 src/gtkprefs.c:681 src/gtkprefs.c:724
 msgid "Text"
 msgstr "文字"
 
-#: src/prefs.c:602 src/prefs.c:681 src/prefs.c:724
+#: src/gtkprefs.c:603 src/gtkprefs.c:682 src/gtkprefs.c:725
 msgid "Pictures and text"
 msgstr "图片和文字"
 
-#: src/prefs.c:603 src/prefs.c:1109
-msgid "None"
-msgstr "无"
-
-#: src/prefs.c:606
+#: src/gtkprefs.c:607
 msgid "_Raise window on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:608
+#: src/gtkprefs.c:609
 msgid "Group Display"
 msgstr "组显示"
 
 #. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/prefs.c:610
+#: src/gtkprefs.c:611
 msgid "Show _numbers in groups"
 msgstr "在组旁显示数字(_N)"
 
-#: src/prefs.c:612
+#: src/gtkprefs.c:613
 msgid "Buddy Display"
 msgstr "好友显示"
 
-#: src/prefs.c:613
+#: src/gtkprefs.c:614
 msgid "Show buddy _icons"
 msgstr "显示好友图标(_I)"
 
-#: src/prefs.c:614
+#: src/gtkprefs.c:615
 msgid "Show _warning levels"
 msgstr "显示警告级别(_W)"
 
-#: src/prefs.c:619
+#: src/gtkprefs.c:620
 msgid "Show idle _times"
 msgstr "显示瞌睡时间(_T)"
 
-#: src/prefs.c:624
+#: src/gtkprefs.c:625
 msgid "Dim i_dle buddies"
 msgstr "显示睡着的好友(_D)"
 
-#: src/prefs.c:642 src/prefs.c:1810
+#: src/gtkprefs.c:643 src/gtkprefs.c:1811
 msgid "Conversations"
 msgstr "对话"
 
-#: src/prefs.c:650
+#: src/gtkprefs.c:651
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/prefs.c:658
+#: src/gtkprefs.c:659
 msgid "Show IMs and chats in _same tabbed window."
 msgstr "在同一标签窗口内显示即时消息和聊天(_S)。"
 
-#: src/prefs.c:677 src/prefs.c:720
+#: src/gtkprefs.c:678 src/gtkprefs.c:721
 msgid "Window"
 msgstr "窗口"
 
-#: src/prefs.c:684 src/prefs.c:727
+#: src/gtkprefs.c:685 src/gtkprefs.c:728
 msgid "New window _width:"
 msgstr "新窗口宽度(_W):"
 
-#: src/prefs.c:685 src/prefs.c:728
+#: src/gtkprefs.c:686 src/gtkprefs.c:729
 msgid "New window _height:"
 msgstr "新窗口高度(_H):"
 
-#: src/prefs.c:686 src/prefs.c:729
+#: src/gtkprefs.c:687 src/gtkprefs.c:730
 msgid "_Entry field height:"
 msgstr "输入框高度(_E):"
 
-#: src/prefs.c:687 src/prefs.c:730
+#: src/gtkprefs.c:688 src/gtkprefs.c:731
 msgid "_Raise windows on events"
 msgstr "发生事件时激活窗口(_R)"
 
-#: src/prefs.c:688
+#: src/gtkprefs.c:689
 msgid "Hide window on _send"
 msgstr "发送时隐藏窗口(_S)"
 
-#: src/prefs.c:691
+#: src/gtkprefs.c:692
 msgid "Buddy Icons"
 msgstr "好友图标"
 
-#: src/prefs.c:692
+#: src/gtkprefs.c:693
 msgid "Hide buddy _icons"
 msgstr "隐藏好友图标(_I)"
 
-#: src/prefs.c:693
+#: src/gtkprefs.c:694
 msgid "Disable buddy icon a_nimation"
 msgstr "禁用好友图标动画(_N)"
 
-#: src/prefs.c:696
+#: src/gtkprefs.c:697
 msgid "Show _logins in window"
 msgstr "在窗口中显示登录(_L)"
 
-#: src/prefs.c:697
+#: src/gtkprefs.c:698
 msgid "Show a_liases in tabs/titles"
 msgstr "在标签/标题中显示别名(_L)"
 
-#: src/prefs.c:699
+#: src/gtkprefs.c:700
 msgid "Typing Notification"
 msgstr "打字提示"
 
-#: src/prefs.c:700
+#: src/gtkprefs.c:701
 msgid "Notify buddies that you are _typing to them"
 msgstr "提醒好友您正在打字给他们(_T)"
 
-#: src/prefs.c:732
+#: src/gtkprefs.c:733
 msgid "Tab Completion"
 msgstr "Tab 补全"
 
-#: src/prefs.c:733
+#: src/gtkprefs.c:734
 msgid "_Tab-complete nicks"
 msgstr "按 Tab 补全昵称(_T)"
 
-#: src/prefs.c:734
+#: src/gtkprefs.c:735
 msgid "_Old-style tab completion"
 msgstr "旧风格的 Tab 补全(_O)"
 
-#: src/prefs.c:737
+#: src/gtkprefs.c:738
 msgid "_Show people joining/leaving in window"
 msgstr "在窗口中显示加入/离开的人(_S)"
 
-#: src/prefs.c:738
+#: src/gtkprefs.c:739
 msgid "Co_lorize screennames"
 msgstr "用户名着色(_L)"
 
-#: src/prefs.c:755
+#: src/gtkprefs.c:756
 msgid "IM Tabs"
 msgstr "即时消息标签"
 
-#: src/prefs.c:756 src/prefs.c:766
+#: src/gtkprefs.c:757 src/gtkprefs.c:767
 msgid "Tab _placement:"
 msgstr "标签位置(_P):"
 
-#: src/prefs.c:757 src/prefs.c:767
+#: src/gtkprefs.c:758 src/gtkprefs.c:768
 msgid "Top"
 msgstr "上"
 
-#: src/prefs.c:758 src/prefs.c:768
+#: src/gtkprefs.c:759 src/gtkprefs.c:769
 msgid "Bottom"
 msgstr "下"
 
-#: src/prefs.c:759 src/prefs.c:769
+#: src/gtkprefs.c:760 src/gtkprefs.c:770
 msgid "Left"
 msgstr "左"
 
-#: src/prefs.c:760 src/prefs.c:770
+#: src/gtkprefs.c:761 src/gtkprefs.c:771
 msgid "Right"
 msgstr "右"
 
-#: src/prefs.c:762
+#: src/gtkprefs.c:763
 msgid ""
 "Show all _instant messages in one tabbed\n"
 "window"
 msgstr "在一个标签式窗口内显示所有即时消息(_I)"
 
-#: src/prefs.c:765
+#: src/gtkprefs.c:766
 msgid "Chat Tabs"
 msgstr "聊天标签"
 
-#: src/prefs.c:772
+#: src/gtkprefs.c:773
 msgid "Show all c_hats in one tabbed window"
 msgstr "在一个标签窗口内显示所有聊天(_H)"
 
-#: src/prefs.c:775
+#: src/gtkprefs.c:776
 msgid "Tab Options"
 msgstr "标签选项"
 
-#: src/prefs.c:776
+#: src/gtkprefs.c:777
 msgid "Show _close button on tabs."
 msgstr "在标签上显示关闭按钮(_C)。"
 
-#: src/prefs.c:796
+#: src/gtkprefs.c:797
 msgid "Proxy Type"
 msgstr "代理类型"
 
-#: src/prefs.c:797
+#: src/gtkprefs.c:798
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: src/prefs.c:798
+#: src/gtkprefs.c:799
 msgid "No proxy"
 msgstr "无代理"
 
-#: src/prefs.c:803
+#: src/gtkprefs.c:804
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: src/prefs.c:816
+#: src/gtkprefs.c:817
 msgid "_Host"
 msgstr "主机(_H)"
 
-#: src/prefs.c:830
+#: src/gtkprefs.c:831
 msgid "Port"
 msgstr "端口"
 
-#: src/prefs.c:846
+#: src/gtkprefs.c:847
 msgid "_User"
 msgstr "用户名(_U)"
 
-#: src/prefs.c:860
+#: src/gtkprefs.c:861
 msgid "Pa_ssword"
 msgstr "密码(_S)"
 
-#: src/prefs.c:881
+#: src/gtkprefs.c:882
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "输入的手动浏览器“%s”无效。超级链接无法工作。"
 
-#: src/prefs.c:902
+#: src/gtkprefs.c:903
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/prefs.c:903
+#: src/gtkprefs.c:904
 msgid "Opera"
 msgstr "Opera"
 
-#: src/prefs.c:904
+#: src/gtkprefs.c:905
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/prefs.c:905
+#: src/gtkprefs.c:906
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:906
+#: src/gtkprefs.c:907
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/prefs.c:914
+#: src/gtkprefs.c:915
 msgid "Manual"
 msgstr "手动"
 
-#: src/prefs.c:938
+#: src/gtkprefs.c:939
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/prefs.c:942
+#: src/gtkprefs.c:943
 msgid "_Browser"
 msgstr "浏览器(_B)"
 
-#: src/prefs.c:950
+#: src/gtkprefs.c:951
 msgid "_Manual: "
 msgstr "手动(_M):"
 
-#: src/prefs.c:965
+#: src/gtkprefs.c:966
 msgid "Browser Options"
 msgstr "浏览器选项"
 
-#: src/prefs.c:966
+#: src/gtkprefs.c:967
 msgid "Open new _window by default"
 msgstr "默认打开新窗口(_W)"
 
-#: src/prefs.c:980
+#: src/gtkprefs.c:981
 msgid "Message Logs"
 msgstr "消息日志"
 
-#: src/prefs.c:981
+#: src/gtkprefs.c:982
 msgid "_Log all instant messages"
 msgstr "记录所有即时消息(_L)"
 
-#: src/prefs.c:982
+#: src/gtkprefs.c:983
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: src/prefs.c:983
+#: src/gtkprefs.c:984
 msgid "Strip _HTML from logs"
 msgstr "从日志中去掉 HTML(_H)"
 
-#: src/prefs.c:985
+#: src/gtkprefs.c:986
 msgid "System Logs"
 msgstr "系统日志"
 
-#: src/prefs.c:986
+#: src/gtkprefs.c:987
 msgid "Log when buddies _sign on/sign off"
 msgstr "记录好友的登入/登出(_S)"
 
-#: src/prefs.c:988
+#: src/gtkprefs.c:989
 msgid "Log when buddies become _idle/un-idle"
 msgstr "记录好友的瞌睡(_I)"
 
-#: src/prefs.c:990
+#: src/gtkprefs.c:991
 msgid "Log when buddies go away/come _back"
 msgstr "记录好友的离开/回来(_B)"
 
-#: src/prefs.c:991
+#: src/gtkprefs.c:992
 msgid "Log your _own signons/idleness/awayness"
 msgstr "记录您自己的登入/瞌睡/离开(_O)"
 
-#: src/prefs.c:993
+#: src/gtkprefs.c:994
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "为每个好友登入创建单独的日志文件(_N)"
 
-#: src/prefs.c:1026
+#: src/gtkprefs.c:1027
 msgid "Sound Options"
 msgstr "声音选项"
 
-#: src/prefs.c:1027
+#: src/gtkprefs.c:1028
 msgid "_No sounds when you log in"
 msgstr "您登入时无声(_N)"
 
-#: src/prefs.c:1028
+#: src/gtkprefs.c:1029
 msgid "_Sounds while away"
 msgstr "离开时发声(_S)"
 
-#: src/prefs.c:1031
+#: src/gtkprefs.c:1032
 msgid "Sound Method"
 msgstr "声音方式"
 
-#: src/prefs.c:1032
+#: src/gtkprefs.c:1033
 msgid "_Method"
 msgstr "方式(_M)"
 
-#: src/prefs.c:1035
+#: src/gtkprefs.c:1036
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: src/prefs.c:1037
+#: src/gtkprefs.c:1038
 msgid "Automatic"
 msgstr "自动"
 
-#: src/prefs.c:1044
+#: src/gtkprefs.c:1045
 msgid "Command"
 msgstr "命令"
 
-#: src/prefs.c:1053
+#: src/gtkprefs.c:1054
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5944,67 +5641,67 @@
 "声音命令(_O)\n"
 "(%s 代表文件名)"
 
-#: src/prefs.c:1092
+#: src/gtkprefs.c:1093
 msgid "_Sending messages removes away status"
 msgstr "发送消息就取消离开的状态(_S)"
 
-#: src/prefs.c:1093
+#: src/gtkprefs.c:1094
 msgid "_Queue new messages when away"
 msgstr "离开时把新消息存入队列(_Q)"
 
-#: src/prefs.c:1095
+#: src/gtkprefs.c:1096
 msgid "Auto-response"
 msgstr "自动回复"
 
-#: src/prefs.c:1098
+#: src/gtkprefs.c:1099
 msgid "Seconds before _resending:"
 msgstr "重发前等的秒数(_R):"
 
-#: src/prefs.c:1100
+#: src/gtkprefs.c:1101
 msgid "_Don't send auto-response"
 msgstr "不发送自动回复(_D)"
 
-#: src/prefs.c:1101
+#: src/gtkprefs.c:1102
 msgid "_Only send auto-response when idle"
 msgstr "仅在打瞌睡时发送自动回复(_O)"
 
-#: src/prefs.c:1102
+#: src/gtkprefs.c:1103
 msgid "Do_n't send auto-response in active conversations"
 msgstr "不在当前对话中发送自动回复(_N)"
 
-#: src/prefs.c:1108
+#: src/gtkprefs.c:1109
 msgid "Idle _time reporting:"
 msgstr "瞌睡时间报告(_T):"
 
-#: src/prefs.c:1110
+#: src/gtkprefs.c:1111
 msgid "Gaim usage"
 msgstr "Gaim 使用"
 
-#: src/prefs.c:1113
+#: src/gtkprefs.c:1114
 msgid "X usage"
 msgstr "X 使用"
 
-#: src/prefs.c:1115
+#: src/gtkprefs.c:1116
 msgid "Windows usage"
 msgstr "窗口使用"
 
-#: src/prefs.c:1122
+#: src/gtkprefs.c:1123
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: src/prefs.c:1123
+#: src/gtkprefs.c:1124
 msgid "Set away _when idle"
 msgstr "瞌睡后即设置离开(_W)"
 
-#: src/prefs.c:1124
+#: src/gtkprefs.c:1125
 msgid "_Minutes before setting away:"
 msgstr "设置离开前等几分钟(_M):"
 
-#: src/prefs.c:1130
+#: src/gtkprefs.c:1131
 msgid "Away m_essage:"
 msgstr "离开消息(_E):"
 
-#: src/prefs.c:1187
+#: src/gtkprefs.c:1188
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -6019,7 +5716,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: src/prefs.c:1192
+#: src/gtkprefs.c:1193
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -6034,141 +5731,494 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">文件名:</span>  %s"
 
-#: src/prefs.c:1367
+#: src/gtkprefs.c:1368
 msgid "Load"
 msgstr "装入"
 
-#: src/prefs.c:1374
+#: src/gtkprefs.c:1375
 msgid "Name"
 msgstr "名称"
 
-#: src/prefs.c:1421
+#: src/gtkprefs.c:1422
 msgid "Details"
 msgstr "细节"
 
-#: src/prefs.c:1520
+#: src/gtkprefs.c:1521
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: src/prefs.c:1613
+#: src/gtkprefs.c:1614
 msgid "Play"
 msgstr "播放"
 
-#: src/prefs.c:1620
+#: src/gtkprefs.c:1621
 msgid "Event"
 msgstr "事件"
 
-#: src/prefs.c:1644
+#: src/gtkprefs.c:1641 src/multi.c:720
+msgid "Reset"
+msgstr "重置"
+
+#: src/gtkprefs.c:1645
 msgid "Choose..."
 msgstr "选择..."
 
-#: src/prefs.c:1768
+#: src/gtkprefs.c:1769
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/prefs.c:1804
+#: src/gtkprefs.c:1805
 msgid "Interface"
 msgstr "界面"
 
-#: src/prefs.c:1805
+#: src/gtkprefs.c:1806
 msgid "Smiley Themes"
 msgstr "笑脸主题"
 
-#: src/prefs.c:1806
+#: src/gtkprefs.c:1807
 msgid "Fonts"
 msgstr "字体"
 
-#: src/prefs.c:1807
+#: src/gtkprefs.c:1808
 msgid "Message Text"
 msgstr "消息文本"
 
-#: src/prefs.c:1808
+#: src/gtkprefs.c:1809
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/prefs.c:1811
+#: src/gtkprefs.c:1812
 msgid "IMs"
 msgstr "即时消息"
 
-#: src/prefs.c:1813
+#: src/gtkprefs.c:1814
 msgid "Tabs"
 msgstr "标签"
 
-#: src/prefs.c:1814
+#: src/gtkprefs.c:1815
 msgid "Proxy"
 msgstr "代理"
 
 #. We use the registered default browser in windows
-#: src/prefs.c:1817
+#: src/gtkprefs.c:1818
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/prefs.c:1819
+#: src/gtkprefs.c:1820
 msgid "Logging"
 msgstr "日志"
 
-#: src/prefs.c:1820
+#: src/gtkprefs.c:1821
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:1821
+#: src/gtkprefs.c:1822
 msgid "Sound Events"
 msgstr "声音事件"
 
-#: src/prefs.c:1822
+#: src/gtkprefs.c:1823
 msgid "Away / Idle"
 msgstr "离开/瞌睡"
 
-#: src/prefs.c:1823
+#: src/gtkprefs.c:1824
 msgid "Away Messages"
 msgstr "离开消息"
 
-#: src/prefs.c:1826
+#: src/gtkprefs.c:1827
 msgid "Plugins"
 msgstr "插件"
 
-#: src/prpl.c:219
-msgid "Gaim - Prompt"
-msgstr "Gaim - 提示"
-
-#: src/prpl.c:302
+#: src/gtkprefs.c:1877 src/main.c:376 src/win32/systray.c:355
+msgid "Preferences"
+msgstr "首选项"
+
+#: src/gtkutils.c:284
+msgid "Can't save icon file to disk."
+msgstr "无法保存 0 字节的图标文件。"
+
+#: src/gtkutils.c:319
+msgid "Gaim - Save Icon"
+msgstr "Gaim - 保存图标"
+
+#: src/html.c:326
+msgid "g003: Error opening connection.\n"
+msgstr "g003:打开连接出错。\n"
+
+#: src/log.c:119
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - 保存对话"
+
+#: src/log.c:160 src/log.c:181 src/log.c:194
+#, c-format
+msgid "Unable to make directory %s for logging"
+msgstr "无法建立日志目录 %s"
+
+#: src/log.c:248 src/log.c:264
+#, c-format
+msgid "IM Sessions with %s\n"
+msgstr "与 %s 的即时消息会话\n"
+
+#: src/log.c:251 src/log.c:267
+#, c-format
+msgid "IM Sessions with %s"
+msgstr "与 %s 的即时消息会话"
+
+#: src/log.c:298
+#, c-format
+msgid "+++ %s (%s) signed on @ %s"
+msgstr "+++ %s (%s) 登入了 @ %s"
+
+#: src/log.c:303
+#, c-format
+msgid "+++ %s (%s) signed off @ %s"
+msgstr "+++ %s (%s) 登出了 @ %s"
+
+#: src/log.c:308
+#, c-format
+msgid "+++ %s (%s) changed away state @ %s"
+msgstr "+++ %s (%s) 更改了离开状态 @ %s"
+
+#: src/log.c:313
+#, c-format
+msgid "+++ %s (%s) came back @ %s"
+msgstr "+++ %s (%s) 回来了 @ %s"
+
+#: src/log.c:318
+#, c-format
+msgid "+++ %s (%s) became idle @ %s"
+msgstr "+++ %s (%s) 睡着了 @ %s"
+
+#: src/log.c:323
+#, c-format
+msgid "+++ %s (%s) returned from idle @ %s"
+msgstr "+++ %s (%s) 睡醒了 @ %s"
+
+#: src/log.c:328
+#, c-format
+msgid "+++ Program exit @ %s"
+msgstr "+++ 程序退出 @ %s"
+
+#: src/log.c:335
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed on @ %s"
+msgstr "%s (%s) 报告 %s (%s) 登入了 @ %s"
+
+#: src/log.c:340
+#, c-format
+msgid "%s (%s) reported that %s (%s) signed off @ %s"
+msgstr "%s (%s) 报告 %s (%s) 登出了 @ %s"
+
+#: src/log.c:345
+#, c-format
+msgid "%s (%s) reported that %s (%s) went away @ %s"
+msgstr "%s (%s) 报告 %s (%s) 离开了 @ %s"
+
+#: src/log.c:350
+#, c-format
+msgid "%s (%s) reported that %s (%s) came back @ %s"
+msgstr "%s (%s) 报告 %s (%s) 回来了 @ %s"
+
+#: src/log.c:355
+#, c-format
+msgid "%s (%s) reported that %s (%s) became idle @ %s"
+msgstr "%s (%s) 报告 %s (%s) 睡着了 @ %s"
+
+#: src/log.c:361
+#, c-format
+msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
+msgstr "%s (%s) 报告 %s (%s) 睡醒了 @ %s"
+
+#: src/log.c:373
+#, c-format
+msgid "%s (%s) reported that %s signed on @ %s"
+msgstr "%s (%s) 报告 %s 登入了 @ %s"
+
+#: src/log.c:378
+#, c-format
+msgid "%s (%s) reported that %s signed off @ %s"
+msgstr "%s (%s) 报告 %s 登出了 @ %s"
+
+#: src/log.c:383
+#, c-format
+msgid "%s (%s) reported that %s went away @ %s"
+msgstr "%s (%s) 报告 %s 离开了 @ %s"
+
+#: src/log.c:388
+#, c-format
+msgid "%s (%s) reported that %s came back @ %s"
+msgstr "%s (%s) 报告 %s 回来了 @ %s"
+
+#: src/log.c:393
+#, c-format
+msgid "%s (%s) reported that %s became idle @ %s"
+msgstr "%s (%s) 报告 %s 睡着了 @ %s"
+
+#: src/log.c:399
+#, c-format
+msgid "%s (%s) reported that %s returned from idle @ %s"
+msgstr "%s (%s) 报告 %s 睡醒了 @ %s"
+
+#: src/main.c:185
+msgid "Please enter your login."
+msgstr "请输入您的登录名。"
+
+#: src/main.c:274
+msgid "<New User>"
+msgstr "<新用户>"
+
+#: src/main.c:316
+msgid "Login"
+msgstr "登入"
+
+#: src/main.c:332
+msgid "Screen Name:"
+msgstr "用户名:"
+
+#. And now for the buttons
+#: src/main.c:366
+msgid "Accounts"
+msgstr "账户"
+
+#: src/main.c:382 src/win32/systray.c:191
+msgid "Sign On"
+msgstr "登入"
+
+#: src/multi.c:265
+msgid "Screenname"
+msgstr "用户名"
+
+#: src/multi.c:293
+msgid "Protocol"
+msgstr "协议"
+
+#: src/multi.c:657
+msgid "Load Buddy Icon"
+msgstr "装入好友图标"
+
+#: src/multi.c:701
+msgid "Buddy Icon File:"
+msgstr "好友图标文件:"
+
+#: src/multi.c:747
+msgid "Login Options"
+msgstr "登入选项"
+
+#: src/multi.c:759
+msgid "Protocol:"
+msgstr "协议:"
+
+#: src/multi.c:774
+msgid "Screenname:"
+msgstr "用户名:"
+
+#: src/multi.c:829
+msgid "Remember Password"
+msgstr "记住密码"
+
+#: src/multi.c:830
+msgid "Auto-Login"
+msgstr "自动登入"
+
+#: src/multi.c:887
+msgid "User Options"
+msgstr "用户选项"
+
+#: src/multi.c:897
+msgid "New Mail Notifications"
+msgstr "新邮件通知"
+
+#: src/multi.c:958
+#, c-format
+msgid "%s Options"
+msgstr "%s 选项"
+
+#: src/multi.c:1002
+msgid "Register with server"
+msgstr "注册服务器"
+
+#: src/multi.c:1035
+msgid "Proxy Options"
+msgstr "代理选项"
+
+#: src/multi.c:1049
+msgid "Proxy _Type"
+msgstr "代理类型(_T)"
+
+#: src/multi.c:1058
+msgid "Use Global Proxy Settings"
+msgstr "使用全局代理设置"
+
+#: src/multi.c:1067
+msgid "No Proxy"
+msgstr "无代理"
+
+#: src/multi.c:1119
+msgid "_Host:"
+msgstr "主机(_H):"
+
+#: src/multi.c:1155
+msgid "_User:"
+msgstr "用户名(_U):"
+
+#: src/multi.c:1171
+msgid "Pa_ssword:"
+msgstr "密码(_S):"
+
+#: src/multi.c:1245
+msgid "Modify Account"
+msgstr "修改账户"
+
+#: src/multi.c:1264
+msgid "Show more options"
+msgstr "显示全部选项"
+
+#: src/multi.c:1264
+msgid "Show fewer options"
+msgstr "显示主要选项"
+
+#: src/multi.c:1375
+msgid "_Login"
+msgstr "登入(_L)"
+
+#: src/multi.c:1393
+#, c-format
+msgid ""
+"Please enter your password for %s.\n"
+"\n"
+msgstr ""
+"请输入您作为 %s 的密码。\n"
+"\n"
+
+#: src/multi.c:1404
+msgid "_Password"
+msgstr "密码(_P)"
+
+#: src/multi.c:1456
+msgid "TOC not found."
+msgstr "TOC 未找到。"
+
+#: src/multi.c:1457
+msgid ""
+"You have attempted to login an IM account using the TOC protocol.  Because "
+"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
+"default. To login, edit this account to use OSCAR or load the TOC plugin."
+msgstr ""
+"您试图使用 TOC 协议登入即时通讯账户。由于此协议优先于 OSCAR,所以该协议现在默"
+"认被编译为插件。如果要登入的话,请编辑此账户使用 OSCAR 或者装入 TOC 插件。"
+
+#: src/multi.c:1465
+msgid "Protocol not found."
+msgstr "协议未找到。"
+
+#: src/multi.c:1466
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+"您无法登入此账户;您没有装入该账户所使用的协议,或者该协议未提供登录功能。"
+
+#: src/multi.c:1546
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: src/multi.c:1547
+msgid "Delete"
+msgstr "删除"
+
+#: src/multi.c:1576
+msgid "Account Editor"
+msgstr "账户编辑器"
+
+#: src/multi.c:1615
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/multi.c:1665
+msgid "Done."
+msgstr "完成。"
+
+#: src/multi.c:1901
+msgid "Signon: "
+msgstr "登入:"
+
+#: src/multi.c:1960
+msgid "Signon"
+msgstr "登入"
+
+#: src/multi.c:1972
+msgid "Cancel All"
+msgstr "全部取消"
+
+#: src/multi.c:2027
+#, c-format
+msgid ""
+"%s\n"
+"%s: %s"
+msgstr ""
+"%s\n"
+"%s:%s"
+
+#: src/multi.c:2048
+#, c-format
+msgid "%s was unable to sign on"
+msgstr "%s 无法登入"
+
+#: src/multi.c:2049
+msgid "Signon Error"
+msgstr "登入出错"
+
+#: src/multi.c:2060
+msgid "Notice"
+msgstr "注意"
+
+#: src/multi.c:2072
+#, c-format
+msgid "%s has been signed off"
+msgstr "%s 已经登出"
+
+#: src/multi.c:2073
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: src/prpl.c:225
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: src/prpl.c:452
+#: src/prpl.c:375
 #, c-format
 msgid "%s has mail from %s: %s"
 msgstr "%s 收到了 %s 发出的邮件:%s"
 
-#: src/prpl.c:452
+#: src/prpl.c:375
 msgid "No Subject"
 msgstr "无主题"
 
-#: src/prpl.c:454
+#: src/prpl.c:377
 #, c-format
 msgid "%s has new mail."
 msgstr "%s 有新邮件。"
 
-#: src/prpl.c:457
+#: src/prpl.c:380
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: src/prpl.c:473
+#: src/prpl.c:396
 msgid "Gaim - New Mail"
 msgstr "Gaim - 新邮件"
 
-#: src/prpl.c:492
+#: src/prpl.c:415
 msgid "Open Mail"
 msgstr "打开邮件"
 
-#: src/prpl.c:694
+#: src/prpl.c:617
 #, 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:702
+#: src/prpl.c:625
 msgid ""
 "\n"
 "\n"
@@ -6178,56 +6228,56 @@
 "\n"
 "您是否想要将他/她添加为您的好友?"
 
-#: src/prpl.c:704
+#: src/prpl.c:628
 msgid "Gaim - Information"
 msgstr "Gaim - 信息"
 
-#: src/prpl.c:706
+#: src/prpl.c:631
 msgid "Gaim - Confirm"
 msgstr "Gaim - 确认"
 
-#: src/prpl.c:747
+#: src/prpl.c:673
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "您目前没有可以注册新账户的协议。"
 
-#: src/prpl.c:784
+#: src/prpl.c:710
 msgid "Gaim - Registration"
 msgstr "Gaim - 注册"
 
-#: src/prpl.c:797
+#: src/prpl.c:723
 msgid "Registration Information"
 msgstr "注册信息"
 
-#: src/prpl.c:811
+#: src/prpl.c:737
 msgid "Register"
 msgstr "注册"
 
-#: src/server.c:54
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "请输入您的密码"
 
-#: src/server.c:880
+#: src/server.c:882
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 条消息)"
 
-#: src/server.c:892
+#: src/server.c:894
 msgid "(1 message)"
 msgstr "(1 条消息)"
 
-#: src/server.c:1072 src/server.c:1079
+#: src/server.c:1074 src/server.c:1081
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入了。"
 
-#: src/server.c:1095 src/server.c:1102
+#: src/server.c:1097 src/server.c:1104
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出了。"
 
-#: src/server.c:1136
+#: src/server.c:1138
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6236,11 +6286,11 @@
 "%s 刚刚被 %s 警告。\n"
 "您新的警告级别是 %d%%"
 
-#: src/server.c:1139
+#: src/server.c:1141
 msgid "an anonymous person"
 msgstr "无名氏"
 
-#: src/server.c:1227
+#: src/server.c:1229
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6249,75 +6299,75 @@
 "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 "%s"
 
-#: src/server.c:1231
+#: src/server.c:1233
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "用户“%s”邀请 %s 加入好友聊天室:“%s”\n"
 
-#: src/server.c:1237
+#: src/server.c:1239
 msgid "Buddy Chat Invite"
 msgstr "好友聊天邀请"
 
-#: src/server.c:1406
+#: src/server.c:1408
 msgid "Gaim - Popup"
 msgstr "Gaim - 弹出窗口"
 
-#: src/server.c:1433
+#: src/server.c:1435
 msgid "More Info"
 msgstr "更多信息"
 
-#: src/sound.c:78
+#: src/sound.c:79
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/sound.c:79
+#: src/sound.c:80
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/sound.c:80
+#: src/sound.c:81
 msgid "Message received"
 msgstr "消息已收到"
 
-#: src/sound.c:81
+#: src/sound.c:82
 msgid "Message received begins conversation"
 msgstr "收到的消息开始对话"
 
-#: src/sound.c:82
+#: src/sound.c:83
 msgid "Message sent"
 msgstr "消息已送出"
 
-#: src/sound.c:83
+#: src/sound.c:84
 msgid "Person enters chat"
 msgstr "有人进入聊天"
 
-#: src/sound.c:84
-msgid "Person leaves chat"
-msgstr "有人离开聊天"
-
 #: src/sound.c:85
+msgid "Person leaves chat"
+msgstr "有人离开聊天"
+
+#: src/sound.c:86
 msgid "You talk in chat"
 msgstr "您在聊天中发言"
 
-#: src/sound.c:86
+#: src/sound.c:87
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#: src/sound.c:89
+#: src/sound.c:90
 msgid "Someone says your name in chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: src/sound.c:183
+#: src/sound.c:184
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
 
-#: src/sound.c:195
+#: src/sound.c:197
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
 
-#: src/sound.c:202
+#: src/sound.c:206
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6424,12 +6474,12 @@
 msgid "Exit"
 msgstr "退出"
 
-#: src/plugin.c:227
+#: src/plugin.c:231
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "插件 %s 未返回任何有效的插件信息"
 
-#: src/plugin.c:231
+#: src/plugin.c:236
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 无法装入您的插件。"