diff po/zh_CN.po @ 21100:29d8c86c14cd

propagate from branch 'im.pidgin.pidgin' (head cd2be742f6c45c200000003fc5a6341297bbe857) to branch 'im.pidgin.cpw.khc.msnp14.soap' (head 1d7d51174ae87c7f03bb1290a8e447bf2a1704a5)
author Ka-Hing Cheung <khc@hxbc.us>
date Thu, 04 Oct 2007 06:13:01 +0000
parents 1f27c4471ccf
children 4c14612e1e22
line wrap: on
line diff
--- a/po/zh_CN.po	Wed Oct 03 05:05:35 2007 +0000
+++ b/po/zh_CN.po	Thu Oct 04 06:13:01 2007 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"POT-Creation-Date: 2007-09-28 15:32-0500\n"
 "PO-Revision-Date: 2007-05-20 20:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,12 +16,18 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../finch/finch.c:229
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
+#, fuzzy
+msgid "Finch"
+msgstr "法语"
+
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。试试“%s -h”查看帮助。\n"
 
-#: ../finch/finch.c:231
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -42,442 +48,523 @@
 "  -n, --nologin       不自动登入\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "出错"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "账户未添加"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "账户的用户名必须非空。"
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "记住密码"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3891
+#: ../finch/gntaccount.c:485
+msgid "There's no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:486
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "修改账户"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "新建账户"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "协议:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5293
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "用户名:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "密码:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
-#: ../pidgin/gtkblist.c:5677
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "别名:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
-#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:338
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6039
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6094
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
-#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
-#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
-#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
+#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "保存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "删除账户"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "删除"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "账户"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "您可以启用/禁用以下列表中的账户。"
 
 #. Add button
-#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
-#: ../pidgin/gtkrequest.c:274
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "添加"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
 
-#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "将用户加为好友吗?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s 想要将 %s 添加为好友%s%s"
 
-#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "同意吗?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "同意"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "您必须提供好友的用户名。"
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "您必须提供组。"
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "您必须选择账户。"
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:295
+msgid "The selected account is not online."
+msgstr ""
+
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "添加好友出错"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "用户名"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1395
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
-#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "别名"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "组"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "账户"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "添加好友"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "请输入好友信息。"
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "聊天"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
-#: ../pidgin/gtkroomlist.c:621
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名称"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+msgid "Auto-join"
+msgstr "自动加入"
+
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "添加聊天"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr ""
 
-#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "添加组出错"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "您必须给出要添加的组名称。"
 
-#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "已存在同名组。"
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "添加组"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "请输入组名称"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "编辑聊天"
 
-#: ../finch/gntblist.c:739
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "请更新必要的字段。"
 
-#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "编辑"
 
-#: ../finch/gntblist.c:754
-msgid "Auto-join"
-msgstr "自动加入"
-
-#: ../finch/gntblist.c:763
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "编辑设置"
 
-#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#, fuzzy
+msgid "Information"
+msgstr "工作信息"
+
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#, fuzzy
+msgid "Retrieving..."
+msgstr "正在认证..."
+
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "信息"
 
-#: ../finch/gntblist.c:831
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "添加好友千里眼"
 
-#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
-#: ../pidgin/gtkconv.c:1599
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "发送文件"
 
-#: ../finch/gntblist.c:842
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "查看日志"
 
-#: ../finch/gntblist.c:922
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "请输入 %s 的新名称"
 
-#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:1002
+#, fuzzy
+msgid "Set Alias"
+msgstr "别名"
+
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "输入空字符串可重置名称。"
 
-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "删除此联系人也将删除该联系人中的全部好友"
 
-#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "删除此组也将删除该组中的全部好友"
 
-#: ../finch/gntblist.c:1010
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您真的想要删除 %s 吗?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1013
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "确认删除"
 
-#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "删除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友列表"
 
-#: ../finch/gntblist.c:1143
+#: ../finch/gntblist.c:1257
 #, fuzzy
 msgid "Place tagged"
 msgstr "已取消"
 
-#: ../finch/gntblist.c:1148
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr ""
 
 #. General
-#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "昵称"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:2875
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
-#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "发呆"
 
-#: ../finch/gntblist.c:1290
+#: ../finch/gntblist.c:1334
+#, fuzzy
+msgid "On Mobile"
+msgstr "移动"
+
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -486,12 +573,12 @@
 "在线: %d\n"
 "总计: %d"
 
-#: ../finch/gntblist.c:1299
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "账户:%s(%s)"
 
-#: ../finch/gntblist.c:1311
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -500,158 +587,279 @@
 "\n"
 "上次看见:%s前"
 
-#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "新建..."
 
-#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "已存..."
 
-#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "插件"
 
-#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
 msgid "_Name"
 msgstr "名称(_N)"
 
-#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
 msgid "_Account"
 msgstr "账户(_A)"
 
-#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
 
-#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6038
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "确定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "选项"
 
-#: ../finch/gntblist.c:2073
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "发送消息..."
 
-#: ../finch/gntblist.c:2077
-msgid "Toggle offline buddies"
-msgstr "切换离线好友"
-
-#: ../finch/gntblist.c:2083
+#: ../finch/gntblist.c:2251
+#, fuzzy
+msgid "Show empty groups"
+msgstr "按组"
+
+#: ../finch/gntblist.c:2257
+#, fuzzy
+msgid "Show offline buddies"
+msgstr "显示离线好友"
+
+#: ../finch/gntblist.c:2263
 msgid "Sort by status"
 msgstr "按状态排序"
 
-#: ../finch/gntblist.c:2087
+#: ../finch/gntblist.c:2267
 msgid "Sort alphabetically"
 msgstr "按字母序排序"
 
-#: ../finch/gntblist.c:2091
+#: ../finch/gntblist.c:2271
 msgid "Sort by log size"
 msgstr "按日志大小排序"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#, fuzzy
+msgid "Certificate Import"
+msgstr "连接端口"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Specify a hostname"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "Certificate Import Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgid "X.509 certificate import failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#, fuzzy
+msgid "Select a PEM certificate"
+msgstr "选择文件"
+
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "Certificate Export Error"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgid "X.509 certificate export failed"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:188
+#, fuzzy, c-format
+msgid "Certificate for %s"
+msgstr "%s 的状态"
+
+#: ../finch/gntcertmgr.c:195
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:198
+msgid "SSL Host Certificate"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgid "Confirm certificate delete"
+msgstr ""
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "主机名"
+
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../pidgin/gtkdebug.c:835
+msgid "Info"
+msgstr "信息"
+
+#. Close button
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:273
+msgid "Close"
+msgstr "关闭"
+
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s(%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 已断开连接。"
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"由于下列错误 %s 已经断开:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3892
-msgid "Connect"
-msgstr "连接"
-
-#: ../finch/gntconv.c:103
+#: ../finch/gntconn.c:128
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"%s 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
+
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+msgid "Re-enable Account"
+msgstr "重新启用账户"
+
+#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "没有这样的命令。"
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "系统错误: 您给命令传送的参数个数不对。"
 
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "该命令只在聊天中可用,对话中无效。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "该命令只在对话中可用,聊天中无效。"
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "命令无法在此协议下工作。"
 
-#: ../finch/gntconv.c:131
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "命令尚未支持。消息未送出。"
-
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:168
+#, fuzzy
+msgid "Message was not sent, because you are not signed on."
+msgstr "消息未发出,因为发送的频率太高:"
+
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -660,24 +868,72 @@
 "\n"
 "%s 正在打字..."
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:298
+#, fuzzy
+msgid "You have left this chat."
+msgstr "您在聊天中发言"
+
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
+
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "记录已停止。此会话中的后续消息将不会被记录。"
+
+#: ../finch/gntconv.c:442
+#, fuzzy
+msgid "Send To"
+msgstr "发送到(_S)"
+
+#: ../finch/gntconv.c:486
+#, fuzzy
+msgid "Conversation"
+msgstr "对话"
+
+#: ../finch/gntconv.c:492
+#, fuzzy
+msgid "Clear Scrollback"
+msgstr "/对话(C)/清除回滚(_R)"
+
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+msgid "Show Timestamps"
+msgstr "显示时间戳"
+
+#: ../finch/gntconv.c:512
+#, fuzzy
+msgid "Add Buddy Pounce..."
+msgstr "添加好友千里眼"
+
+#: ../finch/gntconv.c:527
+#, fuzzy
+msgid "Enable Logging"
+msgstr "/选项(O)/允许记录(L)"
+
+#: ../finch/gntconv.c:533
+#, fuzzy
+msgid "Enable Sounds"
+msgstr "启用声音:"
+
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "用户列表:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "没有这样的命令(在此环境中)。"
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -685,55 +941,59 @@
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
 "此环境下可使用下列命令:\n"
 
-#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
 
-#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: 清除对话回滚。"
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:1135
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: 显示插件窗口。"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: 显示好友列表。"
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts:显示账户窗口。"
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr ""
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr ""
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr ""
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "调试窗口"
 
@@ -741,179 +1001,187 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:262
+#, fuzzy
+msgid "Filter: "
+msgstr "过滤"
+
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "暂停"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "时间戳"
-
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "文件传送 - 已完成 %d%%,共 %d 个文件"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "文件传送"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "进度"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "文件名"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "大小"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "剩余"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2664
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
-#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/msn/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "状态"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "全部传送完成时关闭此窗口"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "清除未完成的传送"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "停止"
 
-#. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "关闭"
-
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "正在传送开始"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "已取消"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "已失败"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#, fuzzy, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f KB/秒"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:431
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "文件传送"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "电子邮件"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "您有邮件了!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
-msgid "From"
-msgstr "来自"
-
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+msgid "Sender"
+msgstr "发送方"
+
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "主题"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s(%s) 有 %d 封新邮件。"
 
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "新邮件"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的信息"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "好友信息"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "继续"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
-msgid "Info"
-msgstr "信息"
-
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "开聊"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀请"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(无)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+msgid "ERROR"
+msgstr ""
+
+#: ../finch/gntplugin.c:75
+#, fuzzy
+msgid "loading plugin failed"
+msgstr "Ping 失败"
+
+#: ../finch/gntplugin.c:84
+msgid "unloading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -930,453 +1198,682 @@
 "网站: %s\n"
 "文件名: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "在您配置插件之前必须先装入它。"
 
-#: ../finch/gntplugin.c:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr ""
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "此插件无配置选项。"
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr "配置插件"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "请输入要监视的好友。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "编辑好友千里眼"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "监视对象"
 
 #. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
-#: ../pidgin/gtkblist.c:5657
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "账户:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "好友名称:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "监视好友的行动..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "登入"
-
-#: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "登出"
-
-#: ../finch/gntpounce.c:374
-msgid "Goes away"
-msgstr "离开"
-
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "回来"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "发起了呆"
+msgid "Signs on"
+msgstr "登入"
 
 #: ../finch/gntpounce.c:377
+msgid "Signs off"
+msgstr "登出"
+
+#: ../finch/gntpounce.c:378
+msgid "Goes away"
+msgstr "离开"
+
+#: ../finch/gntpounce.c:379
+msgid "Returns from away"
+msgstr "回来"
+
+#: ../finch/gntpounce.c:380
+msgid "Becomes idle"
+msgstr "发起了呆"
+
+#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "发完了呆"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "开始打字"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "输入时暂停"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "停止打字"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "发送消息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "动作"
 
-#: ../finch/gntpounce.c:413
-msgid "Open an IM window"
-msgstr "打开即时消息窗口"
-
-#: ../finch/gntpounce.c:414
-msgid "Pop up a notification"
-msgstr "弹出通知"
-
-#: ../finch/gntpounce.c:415
-msgid "Send a message"
-msgstr "发送消息"
-
 #: ../finch/gntpounce.c:416
+msgid "Open an IM window"
+msgstr "打开即时消息窗口"
+
+#: ../finch/gntpounce.c:417
+msgid "Pop up a notification"
+msgstr "弹出通知"
+
+#: ../finch/gntpounce.c:418
+msgid "Send a message"
+msgstr "发送消息"
+
+#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "执行命令"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "仅当我的状态不可用时才监视"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr "再现"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:618
+#, fuzzy
+msgid "Cannot create pounce"
+msgstr "无法更改昵称"
+
+#: ../finch/gntpounce.c:619
+#, fuzzy
+msgid "You do not have any accounts."
+msgstr "您必须选择账户。"
+
+#: ../finch/gntpounce.c:620
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您真的想要删除 %s 在 %s 上的千里眼吗?"
 
-#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "好友千里眼"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 开始向您打字(%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 在给您打字时停了下来(%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已登入(%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 发完呆了(%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 回来了(%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止了给您打字(%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已登出(%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 发起了呆(%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 走了。(%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 给您发送了消息。(%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:92
+#, fuzzy
+msgid "Based on keyboard use"
+msgstr "根据键盘或鼠标使用"
+
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "根据上次发送的消息"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "从不"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "显示发呆时间"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "显示离线好友"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "显示时间戳"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "提醒好友您正在打字给他们"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "日志格式"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "记录对话"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "记录聊天"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "记录状态更改事件"
 
+#: ../finch/gntprefs.c:207
+#, fuzzy
+msgid "Report Idle time"
+msgstr "报告发呆时间(_R):"
+
+#: ../finch/gntprefs.c:208
+#, fuzzy
+msgid "Change status when idle"
+msgstr "发呆时更改状态(_I)"
+
+#: ../finch/gntprefs.c:209
+#, fuzzy
+msgid "Minutes before changing status"
+msgstr "更改状态前等几分钟(_M):"
+
+#: ../finch/gntprefs.c:210
+#, fuzzy
+msgid "Change status to"
+msgstr "将状态更改为(_S):"
+
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "对话"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "日志"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "首选项"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr "未实现。"
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "保存文件..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "打开文件..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs in"
+msgstr "好友登入"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Buddy logs out"
+msgstr "好友登出"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received"
+msgstr "消息已收到"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message received begins conversation"
+msgstr "收到的消息开始对话"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Message sent"
+msgstr "消息已送出"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person enters chat"
+msgstr "有人进入聊天"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "Person leaves chat"
+msgstr "有人离开聊天"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "You talk in chat"
+msgstr "您在聊天中发言"
+
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+msgid "Others talk in chat"
+msgstr "别人在聊天中发言"
+
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+msgid "Someone says your screen name in chat"
+msgstr "别人在聊天中提到您的名字"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer Failure"
+msgstr "GStreamer 失败"
+
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 初始化失败。"
+
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+msgid "(default)"
+msgstr ""
+
+#: ../finch/gntsound.c:729
+#, fuzzy
+msgid "Select Sound File ..."
+msgstr "选择文件夹..."
+
+#: ../finch/gntsound.c:904
+#, fuzzy
+msgid "Sound Preferences"
+msgstr "首选项"
+
+#: ../finch/gntsound.c:915
+#, fuzzy
+msgid "Profiles"
+msgstr "个人资料"
+
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+msgid "Automatic"
+msgstr "自动"
+
+#: ../finch/gntsound.c:957
+#, fuzzy
+msgid "Console Beep"
+msgstr "控制台响铃"
+
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+msgid "Command"
+msgstr "命令"
+
+#: ../finch/gntsound.c:959
+#, fuzzy
+msgid "No Sound"
+msgstr "无声音"
+
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+msgid "Sound Method"
+msgstr "声音方式"
+
+#: ../finch/gntsound.c:966
+#, fuzzy
+msgid "Method: "
+msgstr "方式(_M):"
+
+#: ../finch/gntsound.c:973
+#, fuzzy, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"声音命令(_O):\n"
+"(%s 代表文件名)"
+
+#. Sound options
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+msgid "Sound Options"
+msgstr "声音选项"
+
+#: ../finch/gntsound.c:982
+#, fuzzy
+msgid "Sounds when conversation has focus"
+msgstr "对话获得焦点后发声(_F)"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "总是"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when available"
+msgstr "仅当可用时"
+
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+msgid "Only when not available"
+msgstr "仅当不可用时"
+
+#: ../finch/gntsound.c:999
+#, fuzzy
+msgid "Volume(0-100):"
+msgstr "音量:"
+
+#. Sound events
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+msgid "Sound Events"
+msgstr "声音事件"
+
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+msgid "Event"
+msgstr "事件"
+
+#: ../finch/gntsound.c:1020
+#, fuzzy
+msgid "File"
+msgstr "已失败"
+
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+msgid "Test"
+msgstr "测试"
+
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+msgid "Reset"
+msgstr "重置"
+
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+msgid "Choose..."
+msgstr "选择..."
+
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "您真的想要删除“%s”吗"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "删除状态"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "已存状态"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "标题"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "类型"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2942
-#: ../libpurple/protocols/novell/novell.c:2948
-#: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5492
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/oscar/oscar.c:5734
-#: ../libpurple/protocols/oscar/oscar.c:5750
-#: ../libpurple/protocols/oscar/oscar.c:5757
-#: ../libpurple/protocols/oscar/oscar.c:5764
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/myspace/myspace.c:148
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "消息"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "使用"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "无效的标题"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "请为状态输入非空标题。"
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "重复标题"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "为下列状态使用不同的标题。"
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "子状态"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "状态:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "消息:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "编辑状态"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "为下列账户使用不同的状态"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr ""
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+msgid "Sounds"
+msgstr "声音"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "状态"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#, fuzzy
+msgid "Error loading the plugin."
+msgstr "卸载插件时遇到了错误。"
+
+#: ../finch/plugins/gntclipboard.c:116
+#, fuzzy
+msgid "Couldn't find X display"
+msgstr "无法打开文件"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "无法打开文件"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr ""
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "剪贴板插件"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s 刚刚登入"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s 刚刚登出"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s 给您发送了消息"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s 在 %s 中提到了您的昵称"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s 在 %s 中发送了消息"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "您接受了 IM"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "有人在聊天中别人在聊天中提到您的名字"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "别人在聊天中提到您的名字"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr ""
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr ""
 
@@ -1415,208 +1912,372 @@
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 #, fuzzy
 msgid "GntLastlog"
 msgstr "历史"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog 插件。"
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "账户"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "需要密码才能登入。"
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "输入 %s(%s) 的密码"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "缺少 %s 的协议插件"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4036
+msgid "Connection Error"
+msgstr "连接错误"
+
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "新密码不相同。"
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "完全填入所有字段。"
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "旧密码"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "新密码"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "再次输入新密码"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "更改 %s 的密码"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "请输入您目前的密码和新密码。"
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的用户信息"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2832
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
+#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "好友"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "好友列表"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, fuzzy, c-format
+msgid "Accept certificate for %s?"
+msgstr "接受聊天邀请吗?"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+#, fuzzy
+msgid "Accept"
+msgstr "接受(_A)"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#, fuzzy
+msgid "SSL Certificate Error"
+msgstr "写错误"
+
+#: ../libpurple/certificate.c:1340
+#, fuzzy
+msgid "Invalid certificate chain"
+msgstr "无效的标题"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Make messages
+#: ../libpurple/certificate.c:1881
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1890
+#, fuzzy
+msgid "Certificate Information"
+msgstr "服务器信息"
+
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "注册错误"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:180
+#, fuzzy
+msgid "Unregistration Error"
+msgstr "注册错误"
+
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 已登入"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 已登出"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/msn/servconn.c:141
+#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "无法发送消息: 消息太大。"
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "无法给 %s 发送消息。"
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "消息太长。"
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "无法发送消息。"
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "发送消息"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "发送消息(_S)"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进入了聊天室。"
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 进入了聊天室。"
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "您现在叫做 %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s。"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s 离开了聊天室。"
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "获得连接失败: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "获得名称失败: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "获取服务器名称失败:%s"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/dbus-server.h:85
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "无名称"
 
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "无法创建新的解析器进程\n"
 
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "无法给解析器进程发送请求\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1625,13 +2286,13 @@
 "解析 %s 出错:\n"
 "%s。"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 时出错: %d"
 
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -1640,20 +2301,21 @@
 "从解析器进程读取时出错:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "从解析器进程读取时发生 EOF"
 
-#: ../libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "线程创建失败: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1662,7 +2324,7 @@
 "读取 %s 出错:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1671,7 +2333,7 @@
 "写入 %s 出错:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1680,39 +2342,39 @@
 "访问 %s 出错:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "无法发送 0 字节的文件。"
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
 
-#: ../libpurple/ft.c:340
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要给您发送 %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要给您发送文件"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受来自 %s 的文件传送吗?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1723,60 +2385,62 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 正在发送文件 %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是合法的文件名。\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "%2$s 发送 %1$s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "开始来自 %2$s 的 %1$s 传送"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "文件传送已取消"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了文件传送"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "给 %s 传送文件失败。"
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "来自 %s 的文件传送失败。"
@@ -1935,31 +2599,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr ""
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "纯文本"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "此对话的记录失败。"
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -1968,7 +2632,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -1977,16 +2641,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
@@ -1997,6 +2661,7 @@
 msgstr "您正在使用 %s,但插件需要 %s。"
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr ""
 
@@ -2069,41 +2734,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "设定自动接受设置"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
 #: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:6110
-#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "询问"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "自动接受"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "自动拒绝"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "自动接受文件传送..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2111,113 +2776,18 @@
 "保存文件的路径\n"
 "(请提供完整路径)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "自动拒绝不在好友列表中的用户的请求"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "自动回复"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "设定 %s 的自动回复消息"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "设定自动回复消息"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "设定自动回复消息(_A)"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "自动回复消息"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "发送自动回复消息的情况"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "当我的账户离开时(_A)"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "当我的帐户发呆时(_I)"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "默认回复(_D)"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "状态消息"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr ""
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "最多次数(_X)"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr "我目前不在。请给我留言,我会尽快给您回复。"
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "备注"
 
@@ -2225,28 +2795,30 @@
 msgid "Enter your notes below..."
 msgstr "在下面输入备注..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "编辑备注..."
 
+#. *< major version
+#. *< minor version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "好友备注"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "在特定好友上存储备注..."
 
-#. *  summary
-#: ../libpurple/plugins/buddynote.c:90
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "在好友列表中添加好友备注的选项。"
 
@@ -2305,46 +2877,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "允许您输入文件中的命令来控制。"
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分钟"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "发呆器"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "设定账户发呆时间"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "设置(_S)"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "您的全部账户都没有设为发呆。"
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "取消账户发呆时间的设定"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "取消设置(_U)"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "设定全部账户的发呆时间"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消全部账户的发呆时间"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "允许您手动配置您发了多长时间呆"
 
@@ -2412,19 +2984,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr ""
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2434,102 +3006,110 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "用户离线。"
 
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "自动响应发送:"
 
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已登出。"
 
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
 
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前已被断开。除非您再次登录,否则无法收到消息。"
 
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "消息未发出,因为超过了最大长度。"
 
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "无法发送消息。"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
+msgid "QIP"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "常规日志读取配置"
 
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "快速计算大小"
 
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "日志目录"
 
@@ -2539,19 +3119,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "日志读取器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2564,12 +3144,12 @@
 "\n"
 "警告:此插件仍处于内测阶段,可能会经常崩溃。请小心使用!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono 插件装入器"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "装入 Mono 编写的 .NET 插件。"
 
@@ -2592,7 +3172,7 @@
 msgid "Prepends a newline to displayed message."
 msgstr "在显示的消息前添加新行。"
 
-#. *  summary
+#. *< summary
 #: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
@@ -2613,46 +3193,50 @@
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "离线消息"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/plugins/offlinemsg.c:165
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/plugins/offlinemsg.c:166
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -2662,48 +3246,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl 插件装入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "提供装入 Perl 插件的支持。"
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:20
-msgid "Psychic mode for incoming conversation"
-msgstr ""
-
 #: ../libpurple/plugins/psychic.c:21
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-
-#: ../libpurple/plugins/psychic.c:66
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libpurple/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "仅对好友列表中的用户启用"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "离开时禁用"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "对话时显示通知消息"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 #, fuzzy
 msgid "Raise psychic conversations"
 msgstr "于隐藏对话"
@@ -2714,7 +3298,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "信号测试"
 
@@ -2722,8 +3306,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "测试看看所有的信号是否都工作正确。"
 
@@ -2745,6 +3329,50 @@
 msgid "Tests to see that most things are working."
 msgstr "测试看看大多数功能是否正常。"
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+msgid "Provides SSL support through GNUTLS."
+msgstr "提供通过 GNUTLS 的 SSL 支持。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ssl/ssl-nss.c:813
+#: ../libpurple/plugins/ssl/ssl-nss.c:815
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2763,44 +3391,6 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "提供 SSL 支持库。"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
-msgid "Provides SSL support through GNUTLS."
-msgstr "提供通过 GNUTLS 的 SSL 支持。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
-
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
@@ -2848,7 +3438,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "好友状态通知"
 
@@ -2856,55 +3446,75 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 插件装入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供装入 Tcl 插件的支持"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "无法监听连入的 IM 连接\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中?"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
-#: ../libpurple/protocols/irc/msgs.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5570
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
-msgid "Away"
-msgstr "离开"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:942
+msgid "First name"
+msgstr "名"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:947
+msgid "Last name"
+msgstr "姓"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "电子邮件"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM 账户"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+#, fuzzy
+msgid "XMPP Account"
+msgstr "AIM 账户"
 
 #. *< type
 #. *< ui_requirement
@@ -2916,86 +3526,61 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 协议插件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Purple 联系人"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
-msgid "Hostname"
-msgstr "主机名"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
-msgid "First name"
-msgstr "名"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
-msgid "Last name"
-msgstr "姓"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:932
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
-msgid "AIM Account"
-msgstr "AIM 账户"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 账户"
-
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已经关闭了对话。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "无法发送消息,无法开始对话。"
+
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "无法打开套接字"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "设置套接字选项出错"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "无法将套接字绑定到端口"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "无法在套接字上监听"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "无法发送消息,无法开始对话。"
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3043,287 +3628,313 @@
 msgid "Save buddylist..."
 msgstr "保存好友列表..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "填入注册字段。"
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "密码不匹配。"
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "无法创建新账户。发生了错误。\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "注册了新的 Gadu-Gadu 账户"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "注册成功!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:913
+#: ../libpurple/protocols/jabber/jabber.c:916
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "密码"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "密码(重新输入)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "输入当前令牌"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "当前令牌"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "注册新的 Gadu-Gadu 账户"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "请填入下列字段"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:957
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性别"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "男或女"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "只在线"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "查找好友"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "请在下面输入您的搜索条件"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "填入字段。"
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前的密码与您所指定的密码不同。"
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "无法更改密码。发生了错误。\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "更改 Gadu-Gadu 帐户的密码"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "密码成功更改!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "当前密码"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "请输入您目前 UIN 的密码和新密码:"
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "更改 Gadu-Gadu 密码"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "为好友选择聊天:%s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "添加到聊天..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "离线"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "可用"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2663
-#: ../libpurple/protocols/oscar/oscar.c:3701
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkstatusbox.c:1058
+#, c-format
+msgid "Away"
+msgstr "离开"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3712
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "出生年份"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3913
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "无法显示搜索结果。"
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公开目录"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "未找到匹配的用户"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "没有与您的搜索条件匹配的用户。"
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "无法读取套接字"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "好友列表已下载"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "您的好友列表已经从服务器上下载。"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "好友列表已上传"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友列表存储于服务器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "被屏蔽"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "添加到聊天"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "取消屏蔽"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "屏蔽"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "聊天名(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "聊天错误"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "未连接到服务器。"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "查找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "更改密码..."
 
-#: ../libpurple/protocols/gg/gg.c:2020
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "将好友列表上传到服务器"
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "从服务器下载好友列表"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "从服务器删除好友列表"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "将好友列表保存到文件..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "从文件装入好友列表..."
 
@@ -3338,43 +3949,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 协议插件"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "波兰流行的即时通讯软件"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "目前的话题为: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "未设定话题"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
@@ -3401,7 +4015,8 @@
 msgstr "%s 的 MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "服务器已断开连接"
 
@@ -3410,11 +4025,12 @@
 msgstr "查看 MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "频道(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "密码(_P):"
 
@@ -3422,63 +4038,62 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
+#. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
-#: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2183
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "正连接"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
 #: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "无法创建套接字"
 
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "无法连接到主机"
 
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
-msgid "Connection Failed"
-msgstr "连接失败"
-
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
-msgid "SSL Handshake Failed"
-msgstr "SSL 握手失败"
-
-#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "读取错误"
 
-#: ../libpurple/protocols/irc/irc.c:759
-#: ../libpurple/protocols/silc/chat.c:1421
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "用户"
 
-#: ../libpurple/protocols/irc/irc.c:762
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:776
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "话题"
 
@@ -3490,56 +4105,66 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:893
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC 协议插件"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:894
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "错误更少的 IRC 协议插件"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6621
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
+#: ../libpurple/protocols/qq/qq.c:755
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "服务器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6624
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
+#: ../libpurple/protocols/qq/qq.c:758
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "端口"
 
-#: ../libpurple/protocols/irc/irc.c:919
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "编码"
 
-#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:904
+#: ../libpurple/protocols/jabber/jabber.c:907
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "用户名"
 
-#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "真名"
 
@@ -3547,229 +4172,233 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "无效模式"
 
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被 %s 屏蔽了。"
 
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "屏蔽"
 
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "无法屏蔽 %s:屏蔽列表已满"
 
-#: ../libpurple/protocols/irc/msgs.c:290
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:291
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:292
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "目前位于"
 
-#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "发呆时长"
 
-#: ../libpurple/protocols/irc/msgs.c:326
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "上线时间"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>定义形容词:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "显赫"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:408
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 清除了话题。"
 
-#: ../libpurple/protocols/irc/msgs.c:416
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的话题为: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:434
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "未知信息“%s”"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "未知信息"
 
-#: ../libpurple/protocols/irc/msgs.c:435
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 服务器收到了无法理解的信息。"
 
-#: ../libpurple/protocols/irc/msgs.c:456
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 上的用户数: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:553
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "时间响应"
 
-#: ../libpurple/protocols/irc/msgs.c:554
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC 服务器的本地时间为:"
 
-#: ../libpurple/protocols/irc/msgs.c:565
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "没有这样的频道"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "没有这样的频道"
 
-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "用户未登入"
 
-#: ../libpurple/protocols/irc/msgs.c:584
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
 
-#: ../libpurple/protocols/irc/msgs.c:604
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "无法发送"
 
-#: ../libpurple/protocols/irc/msgs.c:660
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "加入 %s 需要邀请。"
 
-#: ../libpurple/protocols/irc/msgs.c:661
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "只邀请"
 
-#: ../libpurple/protocols/irc/msgs.c:773
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s: %s 踢出了"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s (%s) 踢出"
 
-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "由 %3$s 管理(%1$s %2$s)"
 
-#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "无效的昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "您所选的昵称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../libpurple/protocols/irc/msgs.c:893
+#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:932
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "无法更改昵称"
 
-#: ../libpurple/protocols/irc/msgs.c:953
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您已经参与了频道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "错误: 服务器的 PONG 无效"
 
-#: ../libpurple/protocols/irc/msgs.c:997
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1078
-#, c-format
-msgid "Cannot join %s:"
-msgstr "无法加入 %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1079
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, fuzzy, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "需要注册"
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "无法加入频道"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "昵称或频道暂时不可用。"
 
-#: ../libpurple/protocols/irc/msgs.c:1125
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "来自 %s 的冲击"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要执行的动作&gt;: 执行动作。"
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 向 chanserv 发送命令"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 "deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3778,13 +4407,13 @@
 "devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3792,7 +4421,7 @@
 "j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
 "的话可选提供频道密钥。"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3800,495 +4429,823 @@
 "join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
 "要的话可选提供频道密钥。"
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: 向 memoserv 发送命令"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [频道]: 列出频道中目前的用户。"
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: 向 nickserv 发送命令"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: 向 operserv 发送命令"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quot [……]: 向服务器发送原始命令。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新话题]: 查看或更改频道话题。"
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [昵称]: 向用户发送 CTCP VERSION 请求"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 "voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+#, fuzzy
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 的回复时间: %lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING 响应"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "已断开连接。"
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Unknown Error"
+msgstr "未知错误"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#, fuzzy
+msgid "Ad-Hoc Command Failed"
+msgstr "命令已禁用"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#, fuzzy
+msgid "execute"
+msgstr "未期待"
+
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#: ../libpurple/protocols/jabber/auth.c:114
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "在不提供密码的情况下服务器无法通过您的身份验证"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:508
+#, fuzzy, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
+
+#: ../libpurple/protocols/jabber/auth.c:321
+#: ../libpurple/protocols/jabber/auth.c:322
+#: ../libpurple/protocols/jabber/auth.c:510
+#: ../libpurple/protocols/jabber/auth.c:511
+#: ../libpurple/protocols/jabber/auth.c:598
+#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
-
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
+#: ../libpurple/protocols/jabber/auth.c:334
+#: ../libpurple/protocols/jabber/auth.c:523
+#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:462
+#: ../libpurple/protocols/jabber/auth.c:561
+#: ../libpurple/protocols/jabber/auth.c:776
+#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:942
+#: ../libpurple/protocols/jabber/auth.c:961
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "服务器的响应无效。"
 
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:600
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
+
+#: ../libpurple/protocols/jabber/auth.c:797
+#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL 错误"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
+#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "名"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "街道地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "额外地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "地区"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "区域"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "邮政编码"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "国家"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "电话号码"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "电子邮件"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "组织名称"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "组织单元"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "职务"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3751
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
+#, fuzzy
+msgid "Edit XMPP vCard"
 msgstr "编辑 Jabber vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "客户"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "操作系统"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+#, fuzzy
+msgid "Service Discovery Info"
+msgstr "设置目录信息"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "额外地址"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+#, fuzzy
+msgid "Multi-User Chat"
+msgstr "给聊天起名"
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "用户没有目录信息。"
+
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "命令"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+#, fuzzy
+msgid "XHTML-IM"
+msgstr "HTML"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "注册错误"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+#, fuzzy
+msgid "User Location"
+msgstr "位置"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+#, fuzzy
+msgid "User Avatar"
+msgstr "用户搜索"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "好友状态通知"
+
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+#, fuzzy
+msgid "Software Version"
+msgstr "不支持的版本"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+#, fuzzy
+msgid "Stream Initiation"
+msgstr "方向"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "文件传送"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#, fuzzy
+msgid "User Mood"
+msgstr "用户模式"
+
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "允许限制"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "能力"
+
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "用户名"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "带密钥交换开聊"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "电子邮件地址"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+#, fuzzy
+msgid "User Profile"
+msgstr "个人资料"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+#, fuzzy
+msgid "Jingle"
+msgstr "加入"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+#, fuzzy
+msgid "User Nickname"
+msgstr "用户名"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+#, fuzzy
+msgid "Jingle Video"
+msgstr "实时视频"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+#, fuzzy
+msgid "Message Receipts"
+msgstr "消息已收到"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+#, fuzzy
+msgid "Public Key Publishing"
+msgstr "公钥漏印"
+
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+#, fuzzy
+msgid "User Chatting"
+msgstr "用户选项"
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+#, fuzzy
+msgid "User Browsing"
+msgstr "用户模式"
+
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+#, fuzzy
+msgid "User Gaming"
+msgstr "用户名"
+
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+#, fuzzy
+msgid "User Viewing"
+msgstr "允许限制"
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Trillian 加密"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2906
+msgid "Capabilities"
+msgstr "能力"
+
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "资源"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "优先级"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "中名"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "邮政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "相片"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "图符"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "取消隐身"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "取消目前的通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1379
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1985
+#, fuzzy
+msgid "Log In"
+msgstr "已登入"
+
+#: ../libpurple/protocols/jabber/buddy.c:1989
+#, fuzzy
+msgid "Log Out"
+msgstr "记录聊天"
+
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "唠叨"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "远远离开"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5808
+#: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "下面是您搜索的结果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"要查找联系人,请在给出的输入框中输入搜索条件。注意:您可以使用通配符(%)进行搜索"
-
-#: ../libpurple/protocols/jabber/buddy.c:1694
+"要查找联系人,请在给出的输入框中输入搜索条件。注意:您可以使用通配符(%)进行搜"
+"索"
+
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "目录查询失败"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
 msgstr "无法查询目录服务器。"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "服务器指令:%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
+#: ../libpurple/protocols/jabber/buddy.c:2381
+#, fuzzy
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:2401
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "搜索 Jabber 用户"
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
+#, fuzzy
+msgid "Search for XMPP users"
+msgstr "搜索用户"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "搜索"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "无效的目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "进入用户目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "选择要搜索的用户目录"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "搜索目录"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5252
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "房间(_R):"
 
@@ -4300,541 +5257,775 @@
 msgid "_Handle:"
 msgstr "昵称(_H):"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是有效的房间名"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "无效的房间名"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是有效的服务器名"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是有效的房间昵称"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "无效的房间门昵称"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "配置错误"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "无法配置"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "房间配置错误"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "此房间无法进行配置"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "注册错误"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "收取房间列表时出错"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "无效的服务器"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "进入会议服务器"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "选择要查询的会议服务器"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "查找房间"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr "初始化会话出错"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:145
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:259
+#: ../libpurple/protocols/jabber/jabber.c:312
+#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "写错误"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr "读取错误"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"无法建立与服务器:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "无效的 Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
+#, fuzzy
+msgid "Invalid XMPP ID"
+msgstr "无效 ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:580
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:662
+#, fuzzy, c-format
+msgid "Registration to %s successful"
+msgstr "%s@%s 注册成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "注册成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
-msgid "Unknown Error"
-msgstr "未知错误"
-
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:673
+#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:692
+#, fuzzy, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s@%s 注册成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:694
+#: ../libpurple/protocols/jabber/jabber.c:695
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr "注册成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:703
+#: ../libpurple/protocols/jabber/jabber.c:704
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr "注册失败"
+
+#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "已注册"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "州/省"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "邮政编码"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "电话"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:987
+#, fuzzy
+msgid "Unregister"
+msgstr "注册"
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+#, fuzzy
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "请在下面填入信息以注册您新的账户。"
+
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#: ../libpurple/protocols/jabber/jabber.c:873
-#: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
+#: ../libpurple/protocols/jabber/jabber.c:1005
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#, fuzzy
+msgid "Register New XMPP Account"
 msgstr "注册新的 Jabber 账户"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "注册"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#, fuzzy, c-format
+msgid "Change Account Registration at %s"
+msgstr "更改 %s 的用户信息"
+
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, fuzzy, c-format
+msgid "Register New Account at %s"
+msgstr "注册新的 Jabber 账户"
+
+#: ../libpurple/protocols/jabber/jabber.c:1016
+#, fuzzy
+msgid "Change Registration"
+msgstr "注册错误"
+
+#: ../libpurple/protocols/jabber/jabber.c:1120
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "更改账户信息出错"
+
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#, fuzzy
+msgid "Account successfully unregistered"
+msgstr "您成功创建了一个群"
+
+#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1289
+#, fuzzy
+msgid "Initializing SSL/TLS"
+msgstr "初始化流"
+
+#: ../libpurple/protocols/jabber/jabber.c:1293
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "正在认证"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "重新初始化流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/jabber/jabber.c:1396
+#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "未认证"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "双向"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "来自(待推迟)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1446
+msgid "From"
+msgstr "来自"
+
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "无(待推迟)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "无"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "订阅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/usermood.c:166
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "心情"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#, fuzzy
+msgid "Mood Text"
+msgstr "血型"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Artist"
+msgstr "美工"
+
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Tune Title"
+msgstr "标题"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#, fuzzy
+msgid "Tune Comment"
+msgstr "好友注释"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "允许"
+
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "密码已更改"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "您的密码已更改。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "更改 Jabber 密码"
-
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
+#, fuzzy
+msgid "Change XMPP Password"
+msgstr "更改密码"
+
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6341
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "设置用户信息..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6352
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "更改密码..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "搜索用户..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "无效请求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "冲突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "特性未实现"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "禁止"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "已走"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "内部服务器错误"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
+#: ../libpurple/protocols/jabber/jabber.c:1859
+#, fuzzy
+msgid "Malformed XMPP ID"
 msgstr "Jabber ID 格式错误"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "不可接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "不允许"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "需要付费"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "收件人不可用"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "需要注册"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "远程服务器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "远程服务器超时"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "服务器超载"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "需要订阅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "未预期的请求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "认证被中断"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "认证的编码不正确"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "无效的认证"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "无效的认证算法"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "认证算法太弱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "临时认证失败"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "格式无效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "无效的命名空间前缀"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "连接超时"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "主机宕机"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "主机未知"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "寻址不恰当"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "无效 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "无效的命名空间"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "无效的 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "不匹配的主机"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "违背策略"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "远程连接失败"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "资源约束"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "限制的 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "查看其它主机"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "系统关机"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "未定义的条件"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "不支持的编码"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "不支持的节类型"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "不支持的版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML 格式有错"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "流错误"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的错误代码: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "无法邀请用户(%s)。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "未知角色:“%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, fuzzy, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "无法发送消息: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:2185
+#, fuzzy, c-format
+msgid "Unable to ping user %s"
+msgstr "无法屏蔽用户 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:2217
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2213
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2239
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "无法给 %s 发送文件,用户不支持文件传送"
+
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config: 配置聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure: 配置聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [房间]: 离开聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register: 注册聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:2283
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1826
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间中的角色。"
-
-#: ../libpurple/protocols/jabber/jabber.c:1838
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间"
+"中的角色。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1844
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1850
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
 
+#: ../libpurple/protocols/jabber/jabber.c:2324
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4845,106 +6036,212 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 协议插件"
-
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/libxmpp.c:170
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#, fuzzy
+msgid "XMPP Protocol Plugin"
+msgstr "MSN 协议插件"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#, fuzzy
+msgid "Domain"
+msgstr "罗马尼亚语"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:210
+msgid "Require SSL/TLS"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "强制旧 SSL(5223 端口)"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允许在不加密流上的纯文本验证"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "连接端口"
 
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3274
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "连接服务器"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:106
+#, fuzzy, c-format
+msgid "%s has left the conversation."
+msgstr "%s 已经关闭了对话。"
+
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "来自 %s 的消息"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 将话题改为: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "话题为: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
+#: ../libpurple/protocols/jabber/message.c:278
+#, fuzzy
+msgid "XMPP Message Error"
 msgstr "Jabber 消息错误"
 
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (代码 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML 分析错误"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "创建新房间"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "配置房间(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天 %s 出错"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天 %s 出错"
 
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
+#: ../libpurple/protocols/jabber/si.c:838
+#, fuzzy, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "无法给 %s 发送消息。"
+
+#: ../libpurple/protocols/jabber/si.c:840
+#, fuzzy, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "无法给 %s 发送文件,用户不支持文件传送"
+
+#: ../libpurple/protocols/jabber/si.c:842
+#, fuzzy, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr "无法给 %s 发送文件,用户不支持文件传送"
+
+#: ../libpurple/protocols/jabber/si.c:857
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:873
+#, fuzzy
+msgid "Select a Resource"
+msgstr "选择文件"
+
+#: ../libpurple/protocols/jabber/usermood.c:179
+#: ../libpurple/protocols/jabber/usermood.c:180
+#, fuzzy
+msgid "Edit User Mood"
+msgstr "用户模式"
+
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
+#, fuzzy
+msgid "Set"
+msgstr "设置(_S)"
+
+#: ../libpurple/protocols/jabber/usermood.c:191
+#, fuzzy
+msgid "Set Mood..."
+msgstr "发送消息..."
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Set User Nickname"
+msgstr "设置用户限制"
+
+#: ../libpurple/protocols/jabber/usernick.c:76
+#, fuzzy
+msgid "Please specify a new nickname for you."
+msgstr "请输入 %s 的新名称"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:99
+#, fuzzy
+msgid "Set Nickname..."
+msgstr "昵称"
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+#, fuzzy
+msgid "Actions"
+msgstr "动作"
+
+#: ../libpurple/protocols/jabber/xdata.c:380
+#, fuzzy
+msgid "Select an action"
+msgstr "选择文件"
+
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4966,221 +6263,275 @@
 msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "无法处理消息"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "错误(可能是客户端的 bug)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "无效的电子邮件地址"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "用户不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "缺少全称域名"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "已登入"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "用户名无效"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "友好的名称无效"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "列表满"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "已列出"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "未列出"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "用户离线"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "已在模式中"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "已在相对列表"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "组太多"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "无效的组"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "用户未在组中"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "组名太长"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "无法删除零组"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "试图向不存在的组中添加联系人"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "切换板失败"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "通知传送失败"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "缺少必需域"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "FND 的次数太多"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "未登入"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "服务暂时不可用"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "数据库服务器错误"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "命令已禁用"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "文件操作错误"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "给服务器发送的 CHL 值错误"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "服务器忙"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "服务器不可用"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "点通知服务器维护中"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "数据库连接错误"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "服务器即将维护"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "创建连接出错"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 参数未知或不允许"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "无法写入"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "会话过载"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "用户太活跃"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "会话太多"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport 未验证"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "无效的好友文件"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "未期待"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "友好的名称更改太频繁"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "服务器太忙"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1380
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "认证失败"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "离线时不允许"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "不接受新用户"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "没有父母在的儿童 Passport"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport 账户未验证"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "无效的票证"
 
@@ -5194,39 +6545,49 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
-msgid "You have just sent a Nudge!"
-msgstr "您刚刚发送了闪屏振动!"
-
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, fuzzy, c-format
+msgid "%s has nudged you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "设置您的友好名称。"
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "这是其他的 MSN 好友看到的名字。"
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "设置您的家庭电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "设置您的工作电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "设置您的移动电话号码。"
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "允许 MSN 移动寻呼吗?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "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?"
@@ -5234,316 +6595,321 @@
 "在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
 "想要允许还是禁止这一功能?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "允许"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "禁止"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "此 Hotmail 账户可能未激活。"
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "寻呼"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "有你"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "马上回来"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/silc/buddy.c:1473
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "接听电话"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "外出就餐"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "设置友好的名称..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "设置家庭电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "设置工作电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "设置移动电话号码..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "启用/禁用移动设备..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允许/禁止移动寻呼..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "打开 Hotmail 收件箱"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "发送到移动设备"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3409
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "发起聊天(_C)"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
-
-#: ../libpurple/protocols/msn/msn.c:719
+msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
+
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "连接到服务器失败。"
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "常规"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年龄"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "职业"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "位置"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "嗜好和兴趣"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "自我介绍"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1550
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻状况"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "兴趣"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "宠物"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "家乡"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "住所"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "时尚"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "音乐"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "格言"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "联系信息"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "个人"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
 msgstr "家庭电话"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
 msgstr "家庭电话 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
 msgstr "家庭住址"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "个人手机"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "家庭传真"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "个人电子邮件"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "个人 IM"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "纪念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "工作"
 
-#: ../libpurple/protocols/msn/msn.c:1606
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "职称"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "公司"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1679
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "部门"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "职业"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "工作电话"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "办公电话 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1683
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "办公地址"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "办公手机"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "办公寻呼"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "办公传真"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work E-Mail"
 msgstr "办公电子邮件"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "办公 IM"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "开始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "收藏"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "上次更新"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "主页"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "用户尚未创建公开的个人资料。"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -5552,14 +6918,14 @@
 "MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
 "个人资料。"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "配置文件 URL"
 
@@ -5573,24 +6939,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
+#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "MSN 协议插件"
-
-#: ../libpurple/protocols/msn/msn.c:2108
+msgstr "AIM 协议插件"
+
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2199
+#, fuzzy
+msgid "HTTP Method Server"
+msgstr "IPC 测试服务器"
+
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "显示自定义如下:"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
 
 #: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/msn/servconn.c:135
 #: ../libpurple/protocols/qq/qq_proxy.c:242
 #: ../libpurple/protocols/qq/qq_proxy.c:321
 #: ../libpurple/protocols/qq/qq_proxy.c:366
@@ -5604,8 +6976,8 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:268
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:302
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "无法连接"
 
@@ -5616,7 +6988,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:184
 #: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "未知错误。"
 
@@ -5654,15 +7026,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "服务暂时不可用。"
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "无法重命名组"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5684,15 +7056,15 @@
 "\n"
 "维护完成后,您将能够成功登入。"
 
-#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "写入错误"
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "读取错误"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -5710,8 +7082,8 @@
 msgstr "分析 HTTP 出错。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3469
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "您在其它位置用此用户名登入了。"
 
@@ -5723,34 +7095,34 @@
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 服务器目前维护中。"
 
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "无法通过身份验证: %s"
 
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
 
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "握手"
 
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "开始身份验证"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "获得 cookie"
 
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "发送 cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
@@ -5788,158 +7160,572 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "消息未发出,因为切换板发生了错误:"
 
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#: ../libpurple/protocols/msn/switchboard.c:956
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 刚刚给您发送了闪屏振动!"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 已将您添加为好友。"
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 已经将您从好友名单中删除。"
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "无法添加“%s”。"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "指定的用户名无效。"
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1801
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:349
+#, fuzzy
+msgid "Reading challenge"
+msgstr "读取错误"
+
+#: ../libpurple/protocols/myspace/myspace.c:355
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "服务器的挑战无效"
+
+#: ../libpurple/protocols/myspace/myspace.c:359
+#, fuzzy
+msgid "Logging in"
+msgstr "日志"
+
+#: ../libpurple/protocols/myspace/myspace.c:1286
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1328
+#, fuzzy
+msgid "New mail messages"
+msgstr "发送消息"
+
+#: ../libpurple/protocols/myspace/myspace.c:1329
+msgid "New blog comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1330
+msgid "New profile comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1331
+msgid "New friend requests!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1332
+msgid "New picture comments"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1360
+msgid "MySpace"
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1543
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "已连接"
+
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
+#, fuzzy
+msgid "No username set"
+msgstr "无名称"
+
+#: ../libpurple/protocols/myspace/myspace.c:1555
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1782
+#, fuzzy, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "进程返回了错误代码 %d"
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#, fuzzy
+msgid "Failed to add buddy"
+msgstr "在聊天中加入好友失败"
+
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#, fuzzy
+msgid "'addbuddy' command failed."
+msgstr "从文件装入好友列表..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#, fuzzy
+msgid "persist command failed"
+msgstr "切换板失败"
+
+#: ../libpurple/protocols/myspace/myspace.c:2115
+#, c-format
+msgid "No such user: %s"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2116
+#, fuzzy
+msgid "User lookup"
+msgstr "用户房间"
+
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
+#, fuzzy
+msgid "Failed to remove buddy"
+msgstr "在聊天中加入好友失败"
+
+#: ../libpurple/protocols/myspace/myspace.c:2228
+msgid "'delbuddy' command failed"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2269
+#, fuzzy
+msgid "blocklist command failed"
+msgstr "切换板失败"
+
+#: ../libpurple/protocols/myspace/myspace.c:2315
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "完成连接"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
+#, fuzzy
+msgid "Read buffer full"
+msgstr "队列满"
+
+#: ../libpurple/protocols/myspace/myspace.c:2402
+#, fuzzy
+msgid "Unparseable message"
+msgstr "无法处理消息"
+
+#: ../libpurple/protocols/myspace/myspace.c:2471
+#, fuzzy, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "无法连接到主机"
+
+#: ../libpurple/protocols/myspace/myspace.c:2642
+#, fuzzy
+msgid "IM Friends"
+msgstr "即时消息窗口(_I)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2741
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2742
+#, fuzzy
+msgid "Add contacts from server"
+msgstr "服务器的响应无效。"
+
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2795
+#, fuzzy
+msgid "Importing friends failed"
+msgstr "无效的好友文件"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2851
+#, fuzzy
+msgid "Find people..."
+msgstr "查找好友..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2854
+#, fuzzy
+msgid "Change IM name..."
+msgstr "更改密码..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3156
+msgid "myim URL handler"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3157
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3158
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3281
+msgid "Show display name in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3284
+msgid "Show headline in status text"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3289
+#, fuzzy
+msgid "Send emoticons"
+msgstr "声音选项"
+
+#: ../libpurple/protocols/myspace/myspace.c:3294
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3297
+#, fuzzy
+msgid "Base font size (points)"
+msgstr "较大字体"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "用户"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2964
+msgid "Profile"
+msgstr "个人资料"
+
+#: ../libpurple/protocols/myspace/user.c:124
+#, fuzzy
+msgid "Headline"
+msgstr "昵称(_H):"
+
+#: ../libpurple/protocols/myspace/user.c:129
+#, fuzzy
+msgid "Song"
+msgstr "声音"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+#, fuzzy
+msgid "Client Version"
+msgstr "关闭对话"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "话题"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "用户已经屏蔽了您"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s 已登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s 已登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "打盹"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy
+msgid "Goose"
+msgstr "已走"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s 走了。"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, fuzzy, c-format
+msgid "Goosing %s..."
+msgstr "查阅 %s"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, fuzzy, c-format
+msgid "%s has high-fived you!"
+msgstr "%s 已登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s 已登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, fuzzy, c-format
+msgid "%s has raspberried you!"
+msgstr "%s 已登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "请求的参数未传入"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "无法写入网络"
 
+#: ../libpurple/protocols/novell/nmuser.c:1870
+msgid "Unable to read from network"
+msgstr "无法从网络读取套接字"
+
+#: ../libpurple/protocols/novell/nmuser.c:1873
+msgid "Error communicating with server"
+msgstr "与服务器通讯出错"
+
+#: ../libpurple/protocols/novell/nmuser.c:1877
+msgid "Conference not found"
+msgstr "会议未找到"
+
+#: ../libpurple/protocols/novell/nmuser.c:1880
+msgid "Conference does not exist"
+msgstr "会议不存在"
+
 #: ../libpurple/protocols/novell/nmuser.c:1884
-msgid "Unable to read from network"
-msgstr "无法从网络读取套接字"
+msgid "A folder with that name already exists"
+msgstr "已存在同名文件夹"
 
 #: ../libpurple/protocols/novell/nmuser.c:1887
-msgid "Error communicating with server"
-msgstr "与服务器通讯出错"
+msgid "Not supported"
+msgstr "支持"
 
 #: ../libpurple/protocols/novell/nmuser.c:1891
-msgid "Conference not found"
-msgstr "会议未找到"
+msgid "Password has expired"
+msgstr "密码已过期"
 
 #: ../libpurple/protocols/novell/nmuser.c:1894
-msgid "Conference does not exist"
-msgstr "会议不存在"
-
-#: ../libpurple/protocols/novell/nmuser.c:1898
-msgid "A folder with that name already exists"
-msgstr "已存在同名文件夹"
-
-#: ../libpurple/protocols/novell/nmuser.c:1901
-msgid "Not supported"
-msgstr "支持"
-
-#: ../libpurple/protocols/novell/nmuser.c:1905
-msgid "Password has expired"
-msgstr "密码已过期"
-
-#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "密码不对"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "用户未找到"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "账户已经被禁用"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "服务器无法访问目录"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系统管理员已经禁用此操作"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "服务器不可用;请稍候再试"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "无法为同一个文件夹添加两次联系人"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "无法添加您自己"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "昵称或密码不对"
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "无法识别您输入用户名的主机"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您无法将同一个人两次添加到对话"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "您输入了无效的用户名"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "用户已经屏蔽了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "试用版本不允许超过十个用户同时在线"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "用户或者离线,或者已经屏蔽了您"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
@@ -6022,7 +7808,7 @@
 msgstr "无法将 %s 从隐私列表中删除(%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "无法更改服务器端的隐私设置(%s)。"
@@ -6033,7 +7819,7 @@
 msgstr "无法创建会议(%s)。"
 
 #: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "与服务器通讯出错。关闭连接。"
 
@@ -6049,8 +7835,8 @@
 msgid "Mailstop"
 msgstr "邮箱"
 
-#: ../libpurple/protocols/novell/novell.c:1505
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "用户 ID"
 
@@ -6060,41 +7846,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "全名"
 
-#: ../libpurple/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 会议 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "无法通过 SSL 连接到服务器。"
 
-#: ../libpurple/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "正在认证..."
 
+#: ../libpurple/protocols/novell/novell.c:1732
+msgid "Unable to connect to server."
+msgstr "无法连接到服务器。"
+
 #: ../libpurple/protocols/novell/novell.c:1735
-msgid "Unable to connect to server."
-msgstr "无法连接到服务器。"
-
-#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
-#: ../libpurple/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "已经邀请 %s 加入此对话。"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "对话邀请"
 
-#: ../libpurple/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6105,16 +7891,16 @@
 "\n"
 "发出时间: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已被注销,因为您已从其它计算机上登录。"
 
-#: ../libpurple/protocols/novell/novell.c:2070
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6124,17 +7910,18 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-#: ../libpurple/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "出错。SSL 支持未安装。"
 
-#: ../libpurple/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
@@ -6148,53 +7935,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3514
-#: ../libpurple/protocols/novell/novell.c:3516
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 协议插件"
 
-#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "服务器地址"
 
-#: ../libpurple/protocols/novell/novell.c:3539
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "服务器端口"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
+#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
+#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "服务器关闭了连接。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
+#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr "失去与服务器的连接:\n%s"
-
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+msgstr ""
+"失去与服务器的连接:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:392
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "在与服务器的连接中收到了无效的数据。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr "无法建立与服务器:\n%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6205,8 +7987,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM 协议插件"
 
@@ -6220,14 +8002,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ 协议插件"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "编码"
 
@@ -6256,108 +8038,108 @@
 msgid "Direct IM established"
 msgstr "二人世界已建立"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:115
-msgid "Invalid error"
-msgstr "无效错误"
-
 #: ../libpurple/protocols/oscar/oscar.c:116
+msgid "Invalid error"
+msgstr "无效错误"
+
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "主机等级"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "客户等级"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "服务不可用"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "服务未定义"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "废旧 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "主机不支持"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "客户不支持"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "客户拒绝"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
-msgid "Reply too big"
-msgstr "回复太大"
-
 #: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Responses lost"
-msgstr "响应丢失"
+msgid "Reply too big"
+msgstr "回复太大"
 
 #: ../libpurple/protocols/oscar/oscar.c:128
+msgid "Responses lost"
+msgstr "响应丢失"
+
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "请求被禁止"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Busted SNAC payload"
-msgstr "SNAC 有效负载激增"
-
 #: ../libpurple/protocols/oscar/oscar.c:130
+msgid "Busted SNAC payload"
+msgstr "SNAC 有效负载激增"
+
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "权限不够"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "本地许可/禁止"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "太邪恶(发送者)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (receiver)"
 msgstr "太邪恶(接收者)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "无匹配"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
-msgid "List overflow"
-msgstr "列表溢出"
-
 #: ../libpurple/protocols/oscar/oscar.c:137
+msgid "List overflow"
+msgstr "列表溢出"
+
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "请求含糊"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "队列满"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "不位于 AOL 上"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6365,7 +8147,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, fuzzy, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6373,202 +8155,216 @@
 msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友图标"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "语音"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM 二人世界"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "获取文件"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "游戏"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "外挂"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "发送好友列表"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ 直接连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP 用户"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ 服务器转发"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "旧的 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "安全已启用"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "可视聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "实时视频"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "相机"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "无事闲聊"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5763
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "不可用"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5749
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "琐事缠身"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "网上留意"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "在线"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3709
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "IP 地址"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2854
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "警告级别"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr "无法连接到身份验证服务器:\n%s"
-
-#: ../libpurple/protocols/oscar/oscar.c:984
+msgstr ""
+"无法连接到身份验证服务器:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr "无法连接到 BOS 服务器:\n%s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1024
+msgstr ""
+"无法连接到 BOS 服务器:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "用户名已发送"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "连接已建立,已发送 cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1260
+#, fuzzy, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
 "含字母、数字和空格,或者只包含数字。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr "用户名无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1352
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "密码不对。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1366
+#: ../libpurple/protocols/oscar/oscar.c:1377
 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."
@@ -6576,44 +8372,44 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
-#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "收到的认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "输入的 SecurID 密钥无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "输入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "输入所显示的六位数字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1433
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5833
-#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6621,53 +8417,53 @@
 msgstr ""
 "您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "无法获取有效的 AIM 登录码。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您即将被断开。请检查 %s 上的更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "无法获取有效的登录码。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "密码已送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "无法初始化连接"
 
-#: ../libpurple/protocols/oscar/oscar.c:2212
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "认证请求消息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "请同意我将您加入好友!"
 
+#: ../libpurple/protocols/oscar/oscar.c:2272
 #: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5221
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "没有给出理由。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2286
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "认证拒绝消息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6677,17 +8473,17 @@
 "用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2414
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ 请求认证被拒绝。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "用户 %u 同意您将他/她加为好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6700,7 +8496,7 @@
 "发出人: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6713,7 +8509,7 @@
 "发出人:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2445
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6726,36 +8522,36 @@
 "内容是:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您是否想要将此人加为好友?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, 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 条消息,原因是这些消息无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2569
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, 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 条消息,原因是这些消息太大。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6763,90 +8559,72 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, 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 条消息,原因是他/她太可恶了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, 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 条消息,原因是您太可恶了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, 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 条消息,原因未知。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "无法发送消息: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2760
-#: ../libpurple/protocols/oscar/oscar.c:2765
-#: ../libpurple/protocols/oscar/oscar.c:2827
-#: ../libpurple/protocols/oscar/oscar.c:2831
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "未知原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "无法给 %s 发送消息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "用户信息不可用:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2830
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "%s 的用户信息不可用:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2859
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "上线时间"
 
-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "注册时间"
 
-#: ../libpurple/protocols/oscar/oscar.c:2869
-msgid "Capabilities"
-msgstr "能力"
-
-#: ../libpurple/protocols/oscar/oscar.c:2887
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "可用消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2913
-msgid "Profile"
-msgstr "个人资料"
-
-#: ../libpurple/protocols/oscar/oscar.c:2990
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 连接可能已丢失。"
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3177
+#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3398
-msgid "Rate limiting error."
-msgstr "速度限制错误。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3399
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6854,147 +8632,145 @@
 "您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
 "一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3471
-msgid "You have been signed off for an unknown reason."
-msgstr "您已经登出了,原因未知。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已经断开与聊天室 %s 的连接。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3731
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3729
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "个人主页"
 
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "额外信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "邮政编码"
 
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "部门"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "职务"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "网页"
 
-#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "工作信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3879
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列用户名已经和 %s 关联"
 
-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3922
 msgid "Screen name"
 msgstr "用户名"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3973
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "更改账户信息出错"
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "错误 0x%04x:无法格式化用户名,原因是用户名无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "错误 0x%04x:未知错误。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "账户信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:4210
+#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "无法设置 AIM 配置文件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4490
 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 "
@@ -7003,21 +8779,21 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4504
+#, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7027,31 +8803,31 @@
 "truncated for you."
 msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#, fuzzy, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
 "字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "无法添加"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4740
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7059,16 +8835,15 @@
 "暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几小时就"
 "能用了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4914
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5096
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5102
+#: ../libpurple/protocols/oscar/oscar.c:4922
+#: ../libpurple/protocols/oscar/oscar.c:4924
+#: ../libpurple/protocols/oscar/oscar.c:5140
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "孤儿"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7076,44 +8851,39 @@
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(无名称)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5040
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
-"允许的最大值。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5133
+#: ../libpurple/protocols/oscar/oscar.c:5072
+#, fuzzy, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "您的命令失败,原因未知。"
+
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #, 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 允许您将他/她加为好友。您是否想要添加?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "给出的认证"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "用户 %s 允许您将他/她加入好友。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5218
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "认证被许可"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7123,114 +8893,115 @@
 "用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5222
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "认证被拒绝"
 
-#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "交换(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "指定的聊天名称无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5368
+#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "离开消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5512
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(正获取)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5722
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友注释"
 
-#: ../libpurple/protocols/oscar/oscar.c:5831
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "好友注释:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您选择了与 %s 进行二人世界连接。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 "由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "连接(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5947
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "二人世界"
 
-#: ../libpurple/protocols/oscar/oscar.c:5969
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "重新请求认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6028
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "请求认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隐私选项"
 
-#: ../libpurple/protocols/oscar/oscar.c:6053
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6054
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "将地址更改为:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6152
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您并不在等候认证</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6155
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您正在等待下列好友的认证"
 
-#: ../libpurple/protocols/oscar/oscar.c:6156
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7238,73 +9009,73 @@
 "如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
 "求认证”。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "按电子邮件查找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6174
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "按电子邮件地址搜索好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "输入您想要搜索的好友的电子邮件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6178
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "设置用户信息(URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "更改密码(URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "配置 IM 转发(URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "显示隐私选项..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "确认账户"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "显示当前注册的电子邮件地址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "更改当前注册的电子邮件地址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "显示正在等候认证的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "按电子邮件搜索好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr "使用最近的好友组"
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr "显示您发了多长时间呆"
 
-#: ../libpurple/protocols/oscar/oscar.c:6628
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7312,26 +9083,27 @@
 "总是使用 ICQ 代理服务器\n"
 "(较慢,但不会暴露您的 IP 地址)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在试图连接到 %s:%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "正在试图通过代理服务器连接。"
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 刚刚请求和 %s 二人世界"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 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 "
@@ -7340,10 +9112,6 @@
 "现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
 "露您的 IP 地址,所以可能造成潜在的隐私风险。"
 
-#: ../libpurple/protocols/oscar/peer.c:1020
-msgid "_Connect"
-msgstr "连接(_C)"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "主要信息"
@@ -7505,91 +9273,93 @@
 msgid "Update my information"
 msgstr "更新我的信息"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "您的信息已更新"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, fuzzy, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
+"%s."
 msgstr "自定义头像目前不支持。请选择以下的头像"
 
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "无效的 QQ 头像"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
-#: ../libpurple/protocols/qq/group_opt.c:135
-#, c-format
-msgid "You rejected %d's request"
-msgstr "您拒绝了 %d 的请求"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:136
+#, c-format
+msgid "You rejected %d's request"
+msgstr "您拒绝了 %d 的请求"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "输入您的原因:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
-msgid "Reject request"
-msgstr "拒绝请求"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
-msgid "Sorry, you are not my type..."
-msgstr "抱歉,我不接受好友..."
-
 #: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
-msgid "Reject"
-msgstr "拒绝"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:272
-msgid "Add buddy with auth request fails"
+msgid "Reject request"
+msgstr "拒绝请求"
+
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:141
+msgid "Sorry, you are not my type..."
+msgstr "抱歉,我不接受好友..."
+
+#: ../libpurple/protocols/qq/buddy_opt.c:277
+#, fuzzy
+msgid "Add buddy with auth request failed"
 msgstr "添加好友,但身份验证失败"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "您成功删除了好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
-msgid "You have successfully removed yourself from a buddy"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+#, fuzzy
+msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "您成功将您从别人的好友列表中删除"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "用户 %d 需要身份验证"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "在此输入请求"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
-#: ../libpurple/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:407
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "您是否想要和我交朋友?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:408
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "发送"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, fuzzy, c-format
+msgid "You have added %d to buddy list"
 msgstr "您已经将 %d 添加为好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQ 号错误"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "无效的 QQ 号"
 
@@ -7618,71 +9388,73 @@
 msgstr "QQ 群"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+#, fuzzy
+msgid "Please enter external group ID"
 msgstr "请输入外部群 ID"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "您只能搜索永久 QQ 群\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
-#, c-format
-msgid "User %d applied to join group %d"
+#: ../libpurple/protocols/qq/group_im.c:126
+#, fuzzy, c-format
+msgid "User %d requested to join group %d"
 msgstr "用户 %d 申请加入 %d 群"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "原因: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ 群操作"
 
-#: ../libpurple/protocols/qq/group_im.c:133
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "同意"
 
-#: ../libpurple/protocols/qq/group_im.c:171
-#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:212
-#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:248
-#, c-format
-msgid "You [%d] has exit group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:282
-#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr ""
-
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:180
+#, c-format
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:221
+#, c-format
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:257
+#, c-format
+msgid "You [%d] have left group \"%d\""
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_im.c:291
+#, fuzzy, c-format
+msgid "You [%d] have been added to group \"%d\""
+msgstr "您被 %s 添加为好友"
+
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "您已经将此群添加到好友"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+#, fuzzy
+msgid "I am not a member"
 msgstr "我不是群成员"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -7701,31 +9473,35 @@
 msgid "Unknown status"
 msgstr "未知状态"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "此群不允许其他人加入"
 
-#: ../libpurple/protocols/qq/group_join.c:229
-msgid "You have successfully exited the group"
+#: ../libpurple/protocols/qq/group_join.c:233
+#, fuzzy
+msgid "You have successfully left the group"
 msgstr "您已经成功退出了该群"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ 群认证"
 
-#: ../libpurple/protocols/qq/group_join.c:254
-msgid "Your authorization operation has been accepted by the QQ server"
+#: ../libpurple/protocols/qq/group_join.c:258
+#, fuzzy
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "您的身份验证操作已经被 QQ 服务器接受"
 
-#: ../libpurple/protocols/qq/group_join.c:325
-msgid "You inputted a group id outside the acceptable range"
+#: ../libpurple/protocols/qq/group_join.c:329
+#, fuzzy
+msgid "You entered a group ID outside the acceptable range"
 msgstr "您输入的群号超出了可接受的范围"
 
-#: ../libpurple/protocols/qq/group_join.c:356
-msgid "Are you sure to exit this Qun?"
-msgstr "您真的想要退出此群吗?"
-
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
+#, fuzzy
+msgid "Are you sure you want to leave this Qun?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7733,78 +9509,76 @@
 "请注意,如果您是创始人,\n"
 "此操作将永久删除此群。"
 
-#: ../libpurple/protocols/qq/group_join.c:361
-msgid "Go ahead"
-msgstr "继续"
-
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "代码 [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "群操作错误"
 
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#, fuzzy
+msgid "Do you want to approve the request?"
 msgstr "您是否想要同意请求?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
-msgid "You have successfully modify Qun member"
+#: ../libpurple/protocols/qq/group_opt.c:137
+#, fuzzy
+msgid "Enter your reason:"
+msgstr "输入您的原因:"
+
+#: ../libpurple/protocols/qq/group_opt.c:235
+#, fuzzy
+msgid "You have successfully modified Qun member"
 msgstr "您成功修改了群成员"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
-msgid "You have successfully modify Qun information"
+#: ../libpurple/protocols/qq/group_opt.c:305
+#, fuzzy
+msgid "You have successfully modified Qun information"
 msgstr "您成功修改了群信息"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "您成功创建了一个群"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "您现在是否想要设置群资料?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "设置"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "系统消息"
 
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Server ACK"
-msgstr "服务器响应"
-
-#: ../libpurple/protocols/qq/im.c:567
-msgid "Send IM fail\n"
-msgstr "发送对话失败\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
-msgid "Keep alive error, seems connection lost!"
-msgstr "保持在线出错,连接已丢失!"
+#: ../libpurple/protocols/qq/im.c:576
+#, fuzzy
+msgid "Failed to send IM."
+msgstr "获得名称失败: %s"
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
+#, fuzzy
+msgid "Keep alive error"
+msgstr "读取错误"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "请求登录令牌出错!"
+#, fuzzy
+msgid "Error requesting login token"
+msgstr "创建连接出错"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "无法登录,请检查调试日志"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "无法连接。"
@@ -7814,95 +9588,91 @@
 msgid "Unknown-%d"
 msgstr "未知-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s 地址"
-
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:211
+#, fuzzy
+msgid "TCP Address"
+msgstr "IP 地址"
+
+#: ../libpurple/protocols/qq/qq.c:213
+#, fuzzy
+msgid "UDP Address"
+msgstr "IP 地址"
+
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "等级"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: 在线"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: 离开"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: 隐身"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: 离线"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "名称无效"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>连接方式</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>我的公网 IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登录时间</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登录 IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登录时间</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "登录信息"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "修改我的信息"
-
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+#, fuzzy
+msgid "Set My Information"
+msgstr "服务器信息"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "更改密码"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "显示登录信息"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+#, fuzzy
+msgid "Leave this QQ Qun"
 msgstr "退出此 QQ 群"
 
+#: ../libpurple/protocols/qq/qq.c:584
+#, fuzzy
+msgid "Block this buddy"
+msgstr "关闭此标签"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7913,25 +9683,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 协议插件"
 
-#: ../libpurple/protocols/qq/qq.c:740
-msgid "Login in TCP"
-msgstr "以 TCP 方式登录"
-
-#: ../libpurple/protocols/qq/qq.c:743
-msgid "Login Hidden"
-msgstr "隐身登录"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "套接字发送错误"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "连接被拒绝"
+#: ../libpurple/protocols/qq/qq.c:752
+#, fuzzy
+msgid "Connect using TCP"
+msgstr "正连接"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -7941,78 +9700,77 @@
 msgid "Unable to read from socket"
 msgstr "无法读取套接字"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 拒绝了文件 %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "发送文件"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "连接丢失"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "登录失败,无回应"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
-msgid "Do you wanna add this buddy?"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+#, fuzzy
+msgid "Do you want to add this buddy?"
 msgstr "您是否想要将此人加为好友?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "您被 %s 添加为好友"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
-msgid "Would like to add him?"
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
 msgstr "您是否想要添加他?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s 已经将您[%s]添加为好友"
-
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, fuzzy, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s 已将您添加为好友。"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "用户 %s 拒绝了您的请求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
-#, c-format
-msgid "User %s has approved your request"
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, fuzzy, c-format
+msgid "User %s approved your request"
 msgstr "用户 %s 批准了您的请求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
-#, c-format
-msgid "%s wanna add you [%s] as friends"
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, fuzzy, c-format
+msgid "%s wants to add you [%s] as a friend"
 msgstr "%s 想要将您[%s]添加为好友"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "消息:%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友列表中"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
-msgid "Would you like to add him?"
-msgstr "您是否想要添加他?"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "连接已关闭(写入)"
@@ -8076,10 +9834,6 @@
 msgid "Starting Services"
 msgstr "启动服务"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "已连接"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8101,7 +9855,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "无法连接到主机"
 
@@ -8118,53 +9872,49 @@
 msgid "Unable to send message: "
 msgstr "无法发送消息: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 #, fuzzy
 msgid "Place Closed"
 msgstr "已取消"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "话筒"
 
+#: ../libpurple/protocols/sametime/sametime.c:3230
+msgid "Speakers"
+msgstr "扬声器"
+
 #: ../libpurple/protocols/sametime/sametime.c:3231
-msgid "Speakers"
-msgstr "扬声器"
-
-#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "摄像头"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
-msgid "File Transfer"
-msgstr "文件传送"
-
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "支持"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "外部用户"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "创建与用户的会议"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "请输入新会议的主题,以及向 %s 发送的邀请消息"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "新建会议"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "创建"
 
@@ -8192,62 +9942,66 @@
 msgid "Invite to Conference"
 msgstr "邀请会议"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "邀请会议..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "话题:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 连接设置"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+msgid "Connect"
+msgstr "连接"
+
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 #, fuzzy
 msgid "Last Known Client"
 msgstr "客户等级"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "用户名"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, fuzzy, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8255,26 +10009,26 @@
 msgstr ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "选择用户"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "无法添加用户: 用户未找到"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "无法添加用户"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8283,63 +10037,63 @@
 "读取文件 %s 出错:\n"
 "%s。\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "远程存储好友列表"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "好友列表存储模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "本地好友列表"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "与服务器上的列表合并"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "合并并将列表保存到服务器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "与服务器同步列表"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "为账户 %s 导入 Sametime 列表"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "为账户 %s 导出 Sametime 列表"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "无法添加组:组已经存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "您的好友列表中已经存在名为“%s”的组。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "无法添加组"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes 地址簿组结果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8347,38 +10101,38 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "选择 Notes 地址簿"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 #, fuzzy
 msgid "Unable to add group: group not found"
 msgstr "无法从网络读取套接字"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes 地址簿组"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "“%s”的搜索结果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8386,124 +10140,150 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "搜索结果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "无匹配"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "无匹配"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "搜索用户"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "用户搜索"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "导入 Sametime 列表..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "导出 Sametime 列表..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "添加 Notes 地址簿组..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "用户搜索..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "强制登录(忽略服务器重定向)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "隐藏客户端身份"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "用户 %s 未出现于网络中"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../libpurple/protocols/silc/buddy.c:124
 #: ../libpurple/protocols/silc/buddy.c:129
 #: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "密钥协议"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "无法执行密钥协议"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "密钥协议中发生了错误"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "密钥协议失败"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "密钥协议时超时"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "密钥协议已中止"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "密钥协议已中止"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "密钥协议已经开始"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "无法与您自己进行密钥协议"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "远程用户已经从网络中消失了"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8514,69 +10294,99 @@
 "远程主机: %s\n"
 "远程端口: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "密钥协议请求"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "带密码开聊"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "设定聊天密码"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "获取公钥"
 
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "无法获取公钥"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "显示公钥"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "无法装入公钥"
 
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "用户信息"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "无法获取用户信息"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "%s 好友不可信"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8585,275 +10395,358 @@
 "钥。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "打开..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s 好友未出现于网络中"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要添加好友,您必须导入他/她的公钥。请按[导入]以导入公钥。"
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "导入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "选择正确用户"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "发现了多个用户使用同样的公钥。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "已脱离"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不舒服"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "多动"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "机器人"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "高兴"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "郁闷"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "生气"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "警惕"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "害羞"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "无敌"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "热恋"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "打盹"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "枯燥"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "激动"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "饥渴"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "用户模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1207
-msgid "Mood"
-msgstr "心情"
-
-#: ../libpurple/protocols/silc/buddy.c:1555
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "首选联系人"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "首选语言"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "设备"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "时区"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "地理位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "重置聊天密钥"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "带密钥交换开聊"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "带密码开聊"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "获取公钥..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "杀死用户"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上绘画"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "密码句(_P):"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "频道 %s 不在网络中"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "频道信息"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "无法获取频道信息信息"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>频道名称:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>用户数:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>频道创建人:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>频道密码句:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>频道 HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>频道话题:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>频道模式:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>创建者密钥指纹:</b><br%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>创建者密钥漏印:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "添加频道公钥"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "打开公钥..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "频道密码句"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8865,331 +10758,449 @@
 "如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
 "些公钥已经列出的用户才能加入。"
 
-#: ../libpurple/protocols/silc/chat.c:421
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "频道认证"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "添加/删除"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "组名称"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "密码句"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "请输入 %s 频道私有组的名称和密码句。"
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "允许限制"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "邀请列表"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "屏蔽列表"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "添加私有组"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "重置永久"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "设置永久"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "设置用户限制"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "重置话题限制"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "设定话题限制"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "重置私有频道"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "设定私有频道"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "重置绝密频道"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "设定绝密频道"
 
-#: ../libpurple/protocols/silc/chat.c:1034
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "您是 <I>%s</I> 的频道建立者"
-
-#: ../libpurple/protocols/silc/chat.c:1038
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "在您加入私有组之前,必须先加入 %s 频道"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入私有组"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "无法加入私有组"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "调用命令"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "无法调用命令"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全文件传送"
 
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "文件传送时出错"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+#, fuzzy
+msgid "Remote disconnected"
+msgstr "%s 已断开连接"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "权限被禁止"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "密钥协议失败"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+#, fuzzy
+msgid "Connection timed out"
+msgstr "连接超时"
+
+#: ../libpurple/protocols/silc/ft.c:118
+#, fuzzy
+msgid "Creating connection failed"
+msgstr "连接失败"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "文件传送会话不存在"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "没有激活的文件传送会话"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "文件传送已开始"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "无法执行文件传送的密钥协议"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "无法开始传送文件"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "无法发送文件"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+#, fuzzy
+msgid "Error occurred"
+msgstr "错误 "
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s (%s) 杀死了"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s (%s) 杀死"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "服务器登出"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "职位"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "组织"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "单元"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "备注"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "您是 <I>%s</I> 的频道建立者"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "真名"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "状态文本"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公钥指纹"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公钥漏印"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "与服务器脱离"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "无法脱离"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "无法设定话题"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "更改昵称失败"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "房间列表"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "无法获取房间列表"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+#, fuzzy
+msgid "Network is empty"
+msgstr "网络统计"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "没有收到公钥"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "无法获取服务器信息"
 
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
+msgid "Server Statistics"
+msgstr "服务器统计"
+
 #: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
-msgid "Server Statistics"
-msgstr "服务器统计"
-
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "无法获取服务器统计"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "没有可用的服务器统计"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9224,115 +11235,72 @@
 "总计服务器管理员数: %d\n"
 "总计路由器管理员数: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "网络统计"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失败"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "服务器对 ping 的响应"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "无法杀死用户"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "连接到 SILC 服务器时出错"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "密钥交换失败"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "服务器断开连接"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1648
+#, fuzzy
+msgid "Cannot watch user"
+msgstr "无法添加您自己"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "恢复会话"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "身份验证连接"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "校验服务器公钥"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "请求密码句"
 
-#: ../libpurple/protocols/silc/ops.c:1939
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "失败: 版本不匹配,请升级您的客户端"
-
-#: ../libpurple/protocols/silc/ops.c:1942
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "失败: 远程不信任或不支持您的公钥"
-
-#: ../libpurple/protocols/silc/ops.c:1945
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "失败: 远程不支持提议的 KE 组"
-
-#: ../libpurple/protocols/silc/ops.c:1948
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "失败: 远程不支持提议的密码算法"
-
-#: ../libpurple/protocols/silc/ops.c:1951
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失败: 远程不支持提议的 PKCS"
-
-#: ../libpurple/protocols/silc/ops.c:1954
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "失败: 远程不支持提议的散列函数"
-
-#: ../libpurple/protocols/silc/ops.c:1957
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失败: 远程不支持 HMAC"
-
-#: ../libpurple/protocols/silc/ops.c:1959
-msgid "Failure: Incorrect signature"
-msgstr "失败: 签名不正确"
-
-#: ../libpurple/protocols/silc/ops.c:1961
-msgid "Failure: Invalid cookie"
-msgstr "失败: 无效的 cookie"
-
-#: ../libpurple/protocols/silc/ops.c:1972
-msgid "Failure: Authentication failed"
-msgstr "失败: 身份验证失败"
-
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到了 %s 的公钥。您想要接受此公钥吗?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9345,73 +11313,101 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "校验公钥"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "查看(_V)..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "不支持的公钥类型"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "服务器断开连接"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "连接到 SILC 服务器时出错"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "密钥交换失败"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "无法初始化 SILC 客户连接"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "连接到 SILC 服务器"
+
+#: ../libpurple/protocols/silc/silc.c:352
+#, fuzzy, c-format
+msgid "Could not load SILC key pair"
+msgstr "无法装入 SILC 密钥对: %s"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "无法创建连接"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "内存溢出"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "张三"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "找不到或无法访问 ~/.silc 目录"
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "连接到 SILC 服务器"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "无法装入 SILC 密钥对: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "无法创建连接"
-
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:445
+#, fuzzy
+msgid "Error loading SILC key pair"
+msgstr "创建 SILC 密钥对..."
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr "普通"
 
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "热恋"
 
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9419,46 +11415,64 @@
 "\n"
 "您首选的联系方式"
 
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "短信"
 
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "彩信"
 
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "视频会议"
 
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "您的当前状态"
 
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "在线服务"
 
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "让其它人看到您正在使用何种服务"
 
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "让其它人看到您正在使用哪台计算机"
 
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "您的 VCard 文件"
 
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+#, fuzzy
+msgid "Timezone (UTC)"
+msgstr "时区"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "用户在线状态属性"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9467,224 +11481,280 @@
 "您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
 "到的有关您自己的信息。"
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "每日消息"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "没有可用的每日消息"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "没有与此连接关联的每日消息"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
-#: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "创建新的 SILC 密钥对"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "密码句不匹配"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "密钥对生成失败"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "密钥长度"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公钥文件"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "私钥文件"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "密码句(重输)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "创建密钥对"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "在线状态"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "查看每日消息"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "创建 SILC 密钥对..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "用户 <I>%s</I> 未出现于网络中"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "话题太长"
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "您必须指定昵称"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "频道 %s 未找到"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的频道模式: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 未设置频道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "为 %s 设置频道模式失败"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知命令: %s,(可能是客户端 bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [频道]: 离开聊天"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [频道]: 离开聊天"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;昵称&gt;: 查看昵称信息"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: 查看服务器的每日消息"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach: 脱离此会话"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [服务器]: 查看服务器管理细节"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: 向连接的服务器发送 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9701,116 +11771,142 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC 协议插件"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全网际实时会议(SILC)协议"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "网络"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "公钥文件"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "私钥文件"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "公钥认证"
 
-#: ../libpurple/protocols/silc/silc.c:1883
-msgid "Reject watching by other users"
-msgstr "拒绝其他用户监视"
-
-#: ../libpurple/protocols/silc/silc.c:1886
-msgid "Block invites"
-msgstr "屏蔽邀请"
-
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "屏蔽没有密钥交换的聊天"
 
-#: ../libpurple/protocols/silc/silc.c:1892
-msgid "Reject online status attribute requests"
-msgstr "拒绝在线状态属性请求"
-
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "屏蔽白板上的消息"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "自动打开白板"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "对全部聊天消息进行签名并校验"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+#, fuzzy
+msgid "Cannot create SILC key pair\n"
+msgstr "创建 SILC 密钥对..."
+
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "真名:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "用户名:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "电子邮件:\t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主机名:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "组织:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "国家:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "算法:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, fuzzy, c-format
+msgid "Version: \t%s\n"
+msgstr "原因: %s"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -9821,7 +11917,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -9830,73 +11927,156 @@
 "公钥漏印:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公钥信息"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "寻呼"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "计算机"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "终端"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "白板"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "没有可用的服务器统计"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失败: 版本不匹配,请升级您的客户端"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "失败: 远程不信任或不支持您的公钥"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失败: 远程不支持提议的 KE 组"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失败: 远程不支持提议的密码算法"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失败: 远程不支持提议的 PKCS"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "失败: 远程不支持提议的散列函数"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失败: 远程不支持 HMAC"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr "失败: 签名不正确"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr "失败: 无效的 cookie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr "失败: 身份验证失败"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "无法初始化 SILC 客户连接"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "张三"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "找不到或无法访问 ~/.silc 目录"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "无法装入 SILC 密钥对: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "无法写入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "无法连接"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1059
+#, fuzzy
+msgid "Unknown server response."
+msgstr "未知原因。"
+
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "无法创建监听套接字"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "无法解析主机"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "无法解析主机名"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
@@ -9908,37 +12088,37 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 协议插件"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "公布状态(注意: 所有人都可以看到您)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "使用代理"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "代理"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1911
 #, fuzzy
 msgid "Auth User"
 msgstr "AP 用户"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1913
 #, fuzzy
 msgid "Auth Domain"
 msgstr "自动"
@@ -9984,6 +12164,7 @@
 msgstr "不允许对 %s 发出警告。"
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "丢失了一条消息,您超过了服务器速度限制。"
 
@@ -10008,38 +12189,47 @@
 msgstr "您错过了来自 %s 的消息,原因是发送太快。"
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "失败。"
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "需要更多条件。"
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "目录服务暂时不可用。"
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "无关键字。"
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "用户没有目录信息。"
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "国家不被支持。"
 
@@ -10049,18 +12239,22 @@
 msgstr "未知失败: %s。"
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "昵称或密码不对。"
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "服务暂时不可用。"
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "您的警告级别太高,无法登入。"
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -10098,7 +12292,8 @@
 msgid "Password Change Successful"
 msgstr "密码更改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "组(_G):"
 
@@ -10157,41 +12352,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC 协议插件"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s 刚刚给您发送了闪屏振动!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系统消息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "认证拒绝消息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s 拒绝您将他/她加入好友。"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "%s 拒绝您将他/她加入好友。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10201,11 +12396,11 @@
 "Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登入 Yahoo。请检查 %s 上"
 "的更新。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 认证失败"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10213,150 +12408,175 @@
 msgstr ""
 "您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoo.c:2675
+#: ../libpurple/protocols/yahoo/yahoo.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "连接问题"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#, fuzzy, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"失去与服务器的连接:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#, fuzzy, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"无法建立与服务器:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "不在桌前"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "不在办公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "度假中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "郊游"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "不在服务器列表中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "显示为在线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "显示为临时离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 #, fuzzy
 msgid "Presence"
 msgstr "首选项"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "显示为离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "不显示临时离线"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "加入聊天"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 #, fuzzy
 msgid "Presence Settings"
 msgstr "使用环境设置"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
-msgid "Active which ID?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#, fuzzy
+msgid "Activate which ID?"
 msgstr "激活哪个 ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "将谁加入聊天?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "激活 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "在聊天中加入用户..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
-msgid "You have just sent a Buzz!"
-msgstr "您刚刚发送了闪屏振动!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#, fuzzy
+msgid "Open Inbox"
+msgstr "打开 Hotmail 收件箱"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: 列出 Yahoo 网络上的房间"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10370,128 +12590,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo 日本"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "寻呼服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "日本寻呼服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "寻呼端口"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "文件传送服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "日本文件传送服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "文件传送端口"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "聊天房间语系"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "聊天房间列表 URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天服务器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天端口"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "加入聊天失败"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "未知房间"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "可能房间已满"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "不可用"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您现在正在 %s 中聊天。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
-msgid "Failed to join buddy in chat"
-msgstr "在聊天中加入好友失败"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Maybe they're not in a chat?"
-msgstr "可能他们未在聊天中?"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
-msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
-msgid "Voices"
-msgstr "语音"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
-msgid "Webcams"
-msgstr "摄像头"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
-msgid "User Rooms"
-msgstr "用户房间"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -10499,90 +12650,90 @@
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "写错误"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "最新新闻"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "主页"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "酷链接 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "酷链接 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "酷链接 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "上次更新"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s 的用户信息不可用"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "抱歉,此配置文件似乎是目前并不支持的语言或格式。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr "无法获取用户的个人资料。可能临时出现了服务器端问题。请稍后再试。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10591,10 +12742,79 @@
 "无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
 "人资料。如果您确定用户存在的话,请稍候再试。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "用户的配置文件为空。"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "邀请已拒绝"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "加入聊天失败"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "未知房间"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "可能房间已满"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "不可用"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您现在正在 %s 中聊天。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "在聊天中加入好友失败"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "可能他们未在聊天中?"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "获取房间列表失败。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "语音"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "摄像头"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "无法获取房间列表。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "用户房间"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT 服务器连接出现问题。"
@@ -10619,81 +12839,76 @@
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "无法发送给聊天 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
-msgid "User"
-msgstr "用户"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "隐身或未登入"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>从 %s,自 %s 起"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "类(_C):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "实例(_I):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "接收者(_R):"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "试图订阅 %s,%s,%s 失败。"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;昵称&gt;: 定位用户"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;昵称&gt;: 定位用户"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10701,7 +12916,7 @@
 "zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
 "收件人</i>&gt; 发送消息"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10709,15 +12924,15 @@
 "zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
 "送消息"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "重订"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "从服务器获取订阅"
 
@@ -10731,111 +12946,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 协议插件"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "使用 tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc 命令"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "导出到 .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "导出到 .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "从 .anyone 导入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "从 .zephyr.subs 导入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "域"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "暴露"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
-msgstr "无法创建套接字:\n%s"
-
-#: ../libpurple/proxy.c:658
+msgstr ""
+"无法创建套接字:\n"
+"%s"
+
+#: ../libpurple/proxy.c:659
 #, fuzzy, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "无法发送消息: %s"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 出错"
 
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr "无法解析主机名"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "接受(_A)"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "我目前不在"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "已存状态"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 现在叫做 %s。\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:302
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:347
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10844,148 +13071,175 @@
 "%s 邀请了 %s 加入聊天室 %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀请了 %s 加入聊天室 %s\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "接受聊天邀请吗?"
 
+#: ../libpurple/sslconn.c:164
+#, fuzzy
+msgid "SSL Connection Failed"
+msgstr "连接失败"
+
+#: ../libpurple/sslconn.c:166
+msgid "SSL Handshake Failed"
+msgstr "SSL 握手失败"
+
+#: ../libpurple/sslconn.c:168
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+#: ../libpurple/sslconn.c:171
+#, fuzzy
+msgid "Unknown SSL error"
+msgstr "未知错误"
+
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "取消设置"
 
-#: ../libpurple/status.c:156
-msgid "Unavailable"
-msgstr "不可用"
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#, fuzzy
+msgid "Do not disturb"
+msgstr "请勿打扰"
+
+#: ../libpurple/status.c:159
+#, fuzzy
+msgid "Extended away"
+msgstr "远远离开"
 
 #: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "移动"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 将状态从 %s 更改为 %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 现在 %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再 %s 了"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s 发起了呆"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 发完呆了"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 发起了呆"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 发完呆了"
 
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2442
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"
 
-#: ../libpurple/util.c:2443
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr "读取您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
 
-#: ../libpurple/util.c:2906
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: ../libpurple/util.c:2909
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:2935
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: ../libpurple/util.c:2947
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
-#: ../libpurple/util.c:2955
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
 
-#: ../libpurple/util.c:2961
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#: ../libpurple/util.c:2969
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 
-#: ../libpurple/util.c:2975
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 
-#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
+#: ../libpurple/util.c:3552
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
 
-#: ../libpurple/util.c:3368
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3403
+#: ../libpurple/util.c:3747
 #, fuzzy, c-format
 msgid "Error reading from %s: %s"
 msgstr "从套接字读取时出错。"
 
-#: ../libpurple/util.c:3434
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"写入 %s 出错:"
-"%s"
-
-#: ../libpurple/util.c:3459
+msgstr "写入 %s 出错:%s"
+
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "无法连接到 %s: %s"
@@ -11011,55 +13265,77 @@
 msgstr "托盘的方向。"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "登入选项"
 
-#: ../pidgin/gtkaccount.c:492
-msgid "Local alias:"
+#: ../pidgin/gtkaccount.c:428
+#, fuzzy
+msgid "Pro_tocol:"
+msgstr "协议:"
+
+#: ../pidgin/gtkaccount.c:439
+#, fuzzy
+msgid "Screen _name:"
+msgstr "用户名:"
+
+#: ../pidgin/gtkaccount.c:529
+#, fuzzy
+msgid "_Local alias:"
 msgstr "本地别名:"
 
+#: ../pidgin/gtkaccount.c:533
+#, fuzzy
+msgid "Remember pass_word"
+msgstr "记住密码"
+
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "用户选项"
 
+#: ../pidgin/gtkaccount.c:604
+#, fuzzy
+msgid "New _mail notifications"
+msgstr "新邮件通知"
+
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
+#: ../pidgin/gtkaccount.c:609
+#, fuzzy
+msgid "Use this buddy _icon for this account:"
 msgstr "此账户使用此好友图标:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s 选项"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 代理设置"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "使用全局代理设置"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "无代理"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "使用环境设置"
 
@@ -11068,60 +13344,73 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "万事成蹉跎"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "明日复明日"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "代理选项"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "代理类型(_T):"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "用户名(_U):"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "密码(_S):"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1195
+#, fuzzy
+msgid "Unable to save new account"
+msgstr "无法创建连接"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "添加账户"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "基本(_B)"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr ""
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "协议"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11143,231 +13432,250 @@
 "如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#: ../pidgin/gtkblist.c:704
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "加入聊天"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
-#: ../pidgin/gtkroomlist.c:399
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "账户(_A):"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "取消屏蔽(_B)"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "资料(_I)"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "开聊(_M)"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
 msgid "_Send File"
-msgstr "传送(_S)"
-
-#: ../pidgin/gtkblist.c:1077
+msgstr "发送文件"
+
+#: ../pidgin/gtkblist.c:1155
+#, fuzzy
 msgid "Add Buddy _Pounce"
-msgstr "添加好友千里眼(_P)"
-
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+msgstr "添加好友千里眼"
+
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-#: ../pidgin/gtkblist.c:1097
-msgid "Alias..."
-msgstr "别名..."
-
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1238
 msgid "Add a _Buddy"
 msgstr "添加好友(_B)"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1241
 msgid "Add a C_hat"
 msgstr "添加聊天(_H)"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "删除组(_D)"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "自动加入"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "折叠(_C)"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "展开(_E)"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/工具(T)/静音(S)"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
+#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您目前登入的协议中没有一个可以添加好友的。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2757
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2758
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友(B)/新即时消息(_M)..."
 
-#: ../pidgin/gtkblist.c:2759
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友(B)/加入聊天(_C)..."
 
-#: ../pidgin/gtkblist.c:2760
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友(B)/获取用户信息(_I)..."
 
-#: ../pidgin/gtkblist.c:2761
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/好友(B)/查看用户日志(_L)..."
 
-#: ../pidgin/gtkblist.c:2763
-msgid "/Buddies/Show _Offline Buddies"
+#: ../pidgin/gtkblist.c:2875
+#, fuzzy
+msgid "/Buddies/Show"
+msgstr "/好友(_B)"
+
+#: ../pidgin/gtkblist.c:2876
+#, fuzzy
+msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/好友(B)/显示离线好友(_O)"
 
-#: ../pidgin/gtkblist.c:2764
-msgid "/Buddies/Show _Empty Groups"
+#: ../pidgin/gtkblist.c:2877
+#, fuzzy
+msgid "/Buddies/Show/_Empty Groups"
 msgstr "/好友(B)/显示空组(_E)"
 
-#: ../pidgin/gtkblist.c:2765
-msgid "/Buddies/Show Buddy _Details"
+#: ../pidgin/gtkblist.c:2878
+#, fuzzy
+msgid "/Buddies/Show/Buddy _Details"
 msgstr "/好友(B)/显示好友详细资料(_D)"
 
-#: ../pidgin/gtkblist.c:2766
-msgid "/Buddies/Show Idle _Times"
+#: ../pidgin/gtkblist.c:2879
+#, fuzzy
+msgid "/Buddies/Show/Idle _Times"
 msgstr "/好友(B)/显示发呆时间(_T)"
 
-#: ../pidgin/gtkblist.c:2767
+#: ../pidgin/gtkblist.c:2880
+#, fuzzy
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/好友(B)/显示空组(_E)"
+
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友(B)/好友排序(_S)"
 
-#: ../pidgin/gtkblist.c:2769
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友(B)/添加好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2770
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友(B)/添加聊天(_H)..."
 
-#: ../pidgin/gtkblist.c:2771
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/好友(B)/添加组(_G)..."
 
-#: ../pidgin/gtkblist.c:2773
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/好友(B)/退出(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2776
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/账户(_A)"
 
-#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/账户(A)/添加\\/编辑"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2780
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: ../pidgin/gtkblist.c:2781
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具(T)/好友千里眼(_P)"
 
-#: ../pidgin/gtkblist.c:2782
+#: ../pidgin/gtkblist.c:2896
+#, fuzzy
+msgid "/Tools/_Certificates"
+msgstr "/工具(T)/首选项(_E)"
+
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/工具(T)/插件(_G)"
 
-#: ../pidgin/gtkblist.c:2783
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/工具(T)/首选项(_E)"
 
-#: ../pidgin/gtkblist.c:2784
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具(T)/隐私(_I)"
 
-#: ../pidgin/gtkblist.c:2786
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/工具(T)/文件传送(_F)"
 
-#: ../pidgin/gtkblist.c:2787
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/工具(T)/房间列表(_O)"
 
-#: ../pidgin/gtkblist.c:2788
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/工具(T)/系统日志(_L)"
 
-#: ../pidgin/gtkblist.c:2790
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具(T)/静音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2793
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: ../pidgin/gtkblist.c:2794
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/帮助(H)/在线帮助(_H)"
 
-#: ../pidgin/gtkblist.c:2795
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/帮助(H)/调试窗口(_D)"
 
-#: ../pidgin/gtkblist.c:2796
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/帮助(H)/关于(_A)"
 
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -11376,131 +13684,128 @@
 "\n"
 "<b>账户:</b>%s"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "好友别名"
 
-#: ../pidgin/gtkblist.c:2923
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:2969
+#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "上次见面"
 
-#: ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2991
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3453
+#, fuzzy, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "发呆中 (%d小时%02d分) "
+
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "发呆中 (%d小时%02d分) "
 
-#: ../pidgin/gtkblist.c:3320
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "发呆 %d分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友(B)/新即时消息..."
 
-#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友(B)/加入聊天(C)..."
 
-#: ../pidgin/gtkblist.c:3459
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/好友(B)/获取用户信息..."
 
-#: ../pidgin/gtkblist.c:3460
+#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友(B)/添加好友..."
 
-#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/好友(B)/添加聊天..."
 
-#: ../pidgin/gtkblist.c:3462
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/好友(B)/添加组..."
 
-#: ../pidgin/gtkblist.c:3497
-msgid "/Tools/Buddy Pounces"
-msgstr "/工具(T)/好友千里眼(P)"
-
-#: ../pidgin/gtkblist.c:3500
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/工具(T)/隐私(I)"
 
-#: ../pidgin/gtkblist.c:3503
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
 
-#: ../pidgin/gtkblist.c:3677
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "手动"
 
-#: ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkblist.c:3824
 msgid "Alphabetically"
 msgstr "按字母序"
 
-#: ../pidgin/gtkblist.c:3680
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "按状态"
 
-#: ../pidgin/gtkblist.c:3681
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "按日志大小"
 
-#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 已断开连接"
 
-#: ../pidgin/gtkblist.c:3892
-msgid "Re-enable Account"
-msgstr "重新启用账户"
-
-#: ../pidgin/gtkblist.c:3913
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 已经断开连接:%s</span>"
 
-#: ../pidgin/gtkblist.c:4066
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>用户名:</b>"
 
-#: ../pidgin/gtkblist.c:4073
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>密码:</b>"
 
-#: ../pidgin/gtkblist.c:4084
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "登录(_L)"
 
-#: ../pidgin/gtkblist.c:4169
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/账户(A)"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4183
-#, c-format
+#: ../pidgin/gtkblist.c:4334
+#, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -11516,23 +13821,32 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4425
-msgid "/Buddies/Show Offline Buddies"
+#: ../pidgin/gtkblist.c:4597
+#, fuzzy
+msgid "/Buddies/Show/Offline Buddies"
 msgstr "/好友(B)/显示离线好友(O)"
 
-#: ../pidgin/gtkblist.c:4428
-msgid "/Buddies/Show Empty Groups"
+#: ../pidgin/gtkblist.c:4600
+#, fuzzy
+msgid "/Buddies/Show/Empty Groups"
 msgstr "/好友(B)/显示空组(E)"
 
-#: ../pidgin/gtkblist.c:4434
-msgid "/Buddies/Show Buddy Details"
+#: ../pidgin/gtkblist.c:4606
+#, fuzzy
+msgid "/Buddies/Show/Buddy Details"
 msgstr "/好友(B)/显示好友详细资料(D)"
 
-#: ../pidgin/gtkblist.c:4437
-msgid "/Buddies/Show Idle Times"
+#: ../pidgin/gtkblist.c:4609
+#, fuzzy
+msgid "/Buddies/Show/Idle Times"
 msgstr "/好友(B)/显示发呆时间(T)"
 
-#: ../pidgin/gtkblist.c:5271
+#: ../pidgin/gtkblist.c:4612
+#, fuzzy
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/好友(B)/显示空组(E)"
+
+#: ../pidgin/gtkblist.c:5507
 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. "
@@ -11541,65 +13855,76 @@
 "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
 "的话,别名将会替代用户名显示。\n"
 
-#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "组:"
-
-#: ../pidgin/gtkblist.c:5590
+#. End of account box
+#: ../pidgin/gtkblist.c:5542
+#, fuzzy
+msgid "_Screen name:"
+msgstr "用户名:"
+
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#, fuzzy
+msgid "A_lias:"
+msgstr "别名:"
+
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
 
-#: ../pidgin/gtkblist.c:5606
+#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您目前登入的协议中没有一个可以聊天的。"
 
-#: ../pidgin/gtkblist.c:5647
+#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
 
-#: ../pidgin/gtkblist.c:5730
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "请输入要添加的组名称。"
 
-#: ../pidgin/gtkblist.c:6364
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/账户(A)/"
 
-#: ../pidgin/gtkblist.c:6388
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "编辑账户(_E)"
 
-#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "没有可用的操作"
 
-#: ../pidgin/gtkblist.c:6409
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../pidgin/gtkblist.c:6421
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "启用账户"
 
-#: ../pidgin/gtkblist.c:6427
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帐户(A)/启用帐户"
 
-#: ../pidgin/gtkblist.c:6476
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/工具(T)"
 
-#: ../pidgin/gtkblist.c:6546
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友(B)/好友排序(S)"
 
-#: ../pidgin/gtkconn.c:179
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:530
+#, fuzzy
+msgid "SSL Servers"
+msgstr "服务器"
+
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -11611,847 +13936,916 @@
 "\n"
 "%s 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:482
+#, fuzzy
+msgid "Unknown command."
+msgstr "未知命令"
+
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "该好友不在此聊天的协议中。"
 
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您目前登入的协议中没有一个可以邀请好友的。"
 
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "消息(_M):"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "无法打开文件。"
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>与 %s 的谈话</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "保存对话"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "查找"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "搜索文字(_S):"
 
-#: ../pidgin/gtkconv.c:1338
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
-
-#: ../pidgin/gtkconv.c:1346
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "记录已停止。此会话中的后续消息将不会被记录。"
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "取消忽略"
 
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "上次说道"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "无法将图标文件保存到磁盘。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "保存图标"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "动画"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "隐藏图标"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "图标另存为..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "设置自定义图标..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr "删除自定义图标"
 
+#: ../pidgin/gtkconv.c:2861
+msgid "Show All"
+msgstr ""
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/对话(_C)"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/对话(C)/新即时消息(_M)..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/对话(C)/查找(_F)..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/对话(C)/查看日志(_L)"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/对话(C)/另存为(_S)..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/对话(C)/清除回滚(_R)"
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/对话(C)/获取信息(_G)"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/对话(C)/邀请(_V)..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/对话(C)/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/对话(C)/别名(_L)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/对话(C)/屏蔽(_B)..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/对话(C)/取消屏蔽(_U)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/对话(C)/添加(_A)..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/对话(C)/删除(_R)..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2920
+#, fuzzy
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: ../pidgin/gtkconv.c:2922
+#, fuzzy
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/对话(C)/关闭(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/选项(O)/允许记录日志(_L)"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/选项(O)/允许声音(_S)"
 
-#: ../pidgin/gtkconv.c:2821
-msgid "/Options/Show Buddy _Icon"
-msgstr "/选项(O)/显示好友图标(_I)"
-
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/选项(O)/显示格式工具栏(_T)"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/选项(O)/显示时间戳(_I)"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/对话(C)/更多(O)"
 
+#: ../pidgin/gtkconv.c:3117
+#, fuzzy
+msgid "/Options"
+msgstr "/选项(_O)"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/对话(C)"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/对话(C)/查看日志(L)"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/对话(C)/发送文件(N)..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话(C)/添加好友千里眼(P)..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/对话(C)/获取信息(G)"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/对话(C)/邀请(V)..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/对话(C)/别名(L)..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/对话(C)/屏蔽(B)..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/对话(C)/取消屏蔽(U)..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/对话(C)/添加(A)..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/对话(C)/删除(R)..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3240
+#, fuzzy
+msgid "/Conversation/Insert Link..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: ../pidgin/gtkconv.c:3244
+#, fuzzy
+msgid "/Conversation/Insert Image..."
+msgstr "/对话(C)/邀请(V)..."
+
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/选项(O)/允许记录(L)"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/选项(O)/允许声音(S)"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/选项(O)/显示格式工具栏(T)"
 
-#: ../pidgin/gtkconv.c:3049
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/选项(O)/显示时间戳(I)"
 
-#: ../pidgin/gtkconv.c:3052
-msgid "/Options/Show Buddy Icon"
-msgstr "/选项(O)/显示好友图标(I)"
-
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "用户打了几个字,停了一下"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
+#, fuzzy
 msgid "_Send To"
 msgstr "发送到(_S)"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "发送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
 
-#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "正打字"
 
-#: ../pidgin/gtkconv.c:5986
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "停止打字"
 
-#: ../pidgin/gtkconv.c:5991
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "昵称说"
 
-#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未读消息"
 
-#: ../pidgin/gtkconv.c:6001
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7122
+#: ../pidgin/gtkconv.c:7572
+#, fuzzy
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: 清除对话回滚。"
+
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "确认关闭"
 
-#: ../pidgin/gtkconv.c:7154
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您有未读取的消息。您确定真的想要关闭窗口吗?"
 
-#: ../pidgin/gtkconv.c:7689
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "关闭其它标签"
 
-#: ../pidgin/gtkconv.c:7695
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "关闭全部标签"
 
-#: ../pidgin/gtkconv.c:7703
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "此标签漂移"
 
-#: ../pidgin/gtkconv.c:7709
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "关闭此标签"
 
-#: ../pidgin/gtkconv.c:8012
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "关闭对话"
 
-#: ../pidgin/gtkconv.c:8476
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "上次创建的窗口"
 
-#: ../pidgin/gtkconv.c:8478
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "分离即时消息和聊天窗口"
 
-#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "新建窗口"
 
-#: ../pidgin/gtkconv.c:8482
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "按组"
 
-#: ../pidgin/gtkconv.c:8484
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "按账户"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "保存调试日志"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "反转"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "突出显示匹配项"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "只有图标(_I)"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "只有文本(_T)"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "图标和文本(_B)"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "过滤"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "用右键单击可查看更多选项。"
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "级别 "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "选择调试过滤器级别。"
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "全部"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "杂类"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "警告"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "错误 "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "严重错误"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "领导开发者"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
 #: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "开发者"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "开发者和网管"
-
-#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:87
 msgid "support"
 msgstr "支持"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "支持/质控"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+msgid "developer & webmaster"
+msgstr "开发者和网管"
+
+#: ../pidgin/gtkdialogs.c:99
+msgid "Senior Contributor/QA"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "Win32 移植"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "维护者"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim 维护者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "骇客和专属驱动程序[lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber 开发者"
-
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
+#, fuzzy
+msgid "XMPP developer"
+msgstr "开发者"
+
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "原作者"
 
-#: ../pidgin/gtkdialogs.c:121
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:122
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "保加利亚语"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "孟加拉语"
 
-#: ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
-#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "加泰罗尼亚语"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "巴伦西亚-加泰罗尼亚语"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "捷克语"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "丹麦语"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "德语"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "澳大利亚英语"
 
-#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "加拿大英语"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "英国英语"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "世界语"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:161
+#, fuzzy
+msgid "Estonian"
+msgstr "波斯尼亚语"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "波斯语"
 
-#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "法语"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "古吉拉特语"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:172
+msgid "Gujarati Language Team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "希伯莱语"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "印地语"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:176
 #, fuzzy
 msgid "Indonesian"
 msgstr "马其顿语"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "日语"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "乔治亚语"
 
-#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:179
+#, fuzzy
+msgid "Ubuntu Georgian Translators"
+msgstr "当前翻译者"
+
+#: ../pidgin/gtkdialogs.c:180
 #, fuzzy
 msgid "Kannada"
 msgstr "屏蔽"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:180
+msgid "Kannada Translation team"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "库得语"
 
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:185
+#, fuzzy
+msgid "Lao"
+msgstr "狮子座"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 #, fuzzy
 msgid "Bokmål Norwegian"
 msgstr "挪威语"
 
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:192
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "荷兰语"
 
-#: ../pidgin/gtkdialogs.c:175
-msgid "Norwegian"
+#: ../pidgin/gtkdialogs.c:193
+#, fuzzy
+msgid "Norwegian Nynorsk"
 msgstr "挪威语"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:199
 #, fuzzy
 msgid "Pashto"
 msgstr "相片"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "俄语"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: ../pidgin/gtkdialogs.c:185
-msgid "Slovack"
-msgstr "斯洛伐克语"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "阿尔巴尼亚语"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "泰米尔语"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "泰卢固语"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "泰语"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南语团队"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
+msgid "Hong Kong Chinese"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "繁体中文"
 
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
-#: ../pidgin/gtkdialogs.c:323
+#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: ../pidgin/gtkdialogs.c:359
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:374
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:377
+#: ../pidgin/gtkdialogs.c:400
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:418
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:383
+#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr "当前开发者"
 
-#: ../pidgin/gtkdialogs.c:398
+#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr "疯狂补丁编写者"
 
-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "退休开发者"
 
-#: ../pidgin/gtkdialogs.c:428
+#: ../pidgin/gtkdialogs.c:468
+#, fuzzy
+msgid "Retired Crazy Patch Writers"
+msgstr "疯狂补丁编写者"
+
+#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr "美工"
 
-#: ../pidgin/gtkdialogs.c:443
+#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "当前翻译者"
 
-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#: ../pidgin/gtkdialogs.c:481
+#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "调试信息"
 
-#: ../pidgin/gtkdialogs.c:855
+#: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#: ../pidgin/gtkdialogs.c:857
+#: ../pidgin/gtkdialogs.c:908
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr "查看用户日志"
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:1000
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
 
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "给联系人起名"
 
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "请输入此联系人的别名。"
 
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "输入 %s 的别名。"
 
-#: ../pidgin/gtkdialogs.c:990
+#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "好友别名"
 
-#: ../pidgin/gtkdialogs.c:1009
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "给聊天起名"
 
-#: ../pidgin/gtkdialogs.c:1010
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#: ../pidgin/gtkdialogs.c:1047
+#: ../pidgin/gtkdialogs.c:1106
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12463,70 +14857,70 @@
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
 
-#: ../pidgin/gtkdialogs.c:1055
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "删除联系人"
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr "删除联系人(_R)"
 
-#: ../pidgin/gtkdialogs.c:1086
+#: ../pidgin/gtkdialogs.c:1148
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您即将把 %s 组合并到 %s 组中。您真的要这么做吗?"
 
-#: ../pidgin/gtkdialogs.c:1093
+#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr "合并组"
 
-#: ../pidgin/gtkdialogs.c:1094
+#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr "合并组(_M)"
 
-#: ../pidgin/gtkdialogs.c:1144
+#: ../pidgin/gtkdialogs.c:1208
 #, 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 及其所有成员。您真的要这么做吗?"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "删除组"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr "删除组(_R)"
 
-#: ../pidgin/gtkdialogs.c:1181
+#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
 
-#: ../pidgin/gtkdialogs.c:1184
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "删除好友"
 
-#: ../pidgin/gtkdialogs.c:1185
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "删除好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "删除聊天"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr "删除聊天(_R)"
 
@@ -12534,156 +14928,154 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "用鼠标右键单击可查看更多未读消息...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "更改状态"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "显示好友列表"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "新消息..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
+#, fuzzy
 msgid "Blink on new message"
 msgstr "有新信息时闪烁"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "退出"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "未开始"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>接收为:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>发送方:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>接收方:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>发送为:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "没有配置可打开此类型文件的应用程序。"
 
-#: ../pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "打开文件时发生了错误。"
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "调用 %s 出错:%s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "运行 %s 出错"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "进程返回了错误代码 %d"
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "文件名:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "本地文件:"
 
-#: ../pidgin/gtkft.c:699
-msgid "Speed:"
-msgstr "速度:"
-
 #: ../pidgin/gtkft.c:700
+msgid "Speed:"
+msgstr "速度:"
+
+#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "已过时间:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "剩余时间:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "全部传送完成时关闭此窗口(_F)"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "清除未完成的传送(_L)"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "文件传送细节(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "暂停(_P)"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "继续(_R)"
 
-#: ../pidgin/gtkimhtml.c:793
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "粘贴为纯文本(_T)"
 
-#: ../pidgin/gtkimhtml.c:810
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "重置格式(_R)"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "超级链接颜色"
 
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "超级链接悬停颜色"
 
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "绘制超级链接悬停时的颜色。"
 
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:3271
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12693,7 +15085,7 @@
 "\n"
 "默认为 PNG。"
 
-#: ../pidgin/gtkimhtml.c:3274
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12703,7 +15095,7 @@
 "\n"
 "默认为 PNG。"
 
-#: ../pidgin/gtkimhtml.c:3287
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12714,7 +15106,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3290
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -12725,204 +15117,298 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../pidgin/gtkimhtml.c:3410
+#: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "选择字体"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "选择文字颜色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "选择背景颜色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "请输入您想要插入链接的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "插入链接"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "存储图像失败:%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#, fuzzy
+msgid "_Font"
+msgstr "字体"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+#, fuzzy
+msgid "Group Items"
+msgstr "群号"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Ungroup Items"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "粗体"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "斜体"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "下划线"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "较大字体"
-
-#: ../pidgin/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "较小字体"
-
-#: ../pidgin/gtkimhtmltoolbar.c:989
-msgid "Font face"
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+msgid "Strikethrough"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Increase Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Decrease Font Size"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+#, fuzzy
+msgid "Font Face"
 msgstr "字体"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "字体颜色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1013
-msgid "Background color"
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+#, fuzzy
+msgid "Background Color"
 msgstr "背景颜色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
+#: ../pidgin/gtkimhtmltoolbar.c:1098
+#, fuzzy
+msgid "Foreground Color"
+msgstr "字体颜色"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+#, fuzzy
+msgid "Reset Formatting"
 msgstr "重置格式"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "插入链接"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
+#: ../pidgin/gtkimhtmltoolbar.c:1103
+#, fuzzy
+msgid "Insert IM Image"
 msgstr "插入图像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
+#: ../pidgin/gtkimhtmltoolbar.c:1104
+#, fuzzy
+msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<b>_Bold</b>"
+msgstr "<b>密码:</b>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1180
+#, fuzzy
+msgid "<i>_Italic</i>"
+msgstr " <i>(ircop)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+#, fuzzy
+msgid "<u>_Underline</u>"
+msgstr "下划线"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1182
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>保存图像出错</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1185
+#, fuzzy
+msgid "_Normal"
+msgstr "普通"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1191
+#, fuzzy
+msgid "_Font face"
+msgstr "字体"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1192
+#, fuzzy
+msgid "Foreground _color"
+msgstr "字体颜色"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1193
+#, fuzzy
+msgid "Bac_kground color"
+msgstr "背景颜色"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1270
+#, fuzzy
+msgid "_Smiley"
+msgstr "表情"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1276
+#, fuzzy
+msgid "_Image"
+msgstr "保存图像"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1282
+#, fuzzy
+msgid "_Link"
+msgstr "登录(_L)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1288
+msgid "_Horizontal rule"
+msgstr ""
+
+#: ../pidgin/gtklog.c:293
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:304
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您真的想要删除 %s 吗?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:309
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "您真的想要删除选中的已存状态吗?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>于 %2$s 在 %1$s 的对话</span>"
 
-#: ../pidgin/gtklog.c:422
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在 %2$s 与 %1$s 的对话</span>"
 
-#: ../pidgin/gtklog.c:469
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr "仅当启用了“将全部状态更改记录到系统日志”首选项时才会记录系统日志。"
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "仅当启用了“记录全部即时消息”时才会记录即时消息。"
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "仅当启用了“记录所有聊天”首选项时才会记录聊天。"
 
-#: ../pidgin/gtklog.c:527
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "未找到日志。"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:542
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "浏览日志文件夹(_B)"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "总计日志大小:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr "与 %s 的对话"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr "系统日志"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。试试“%s -h”查看帮助。\n"
 
-#: ../pidgin/gtkmain.c:366
-#, c-format
+#: ../pidgin/gtkmain.c:388
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12930,6 +15416,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -12945,85 +15432,88 @@
 "  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
 "  -v, --version       显示当前版本并退出\n"
 
-#: ../pidgin/gtkmain.c:550
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../pidgin/gtknotify.c:337
+"%swiki/DeveloperPages\n"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#, fuzzy
+msgid "Pidgin"
+msgstr "猪"
+
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "打开全部消息"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "发送方"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
 
-#: ../pidgin/gtknotify.c:520
-#, c-format
+#: ../pidgin/gtknotify.c:564
+#, fuzzy, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>您有 %d 封新邮件。</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "浏览器命令“%s”无效。"
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "无法打开 URL"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "调用“%s”出错:%s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "多个插件将会被卸载。"
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "卸载插件"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13034,7 +15524,7 @@
 "<span weight=\"bold\">网站:</span>\t\t%s\n"
 "<span weight=\"bold\">文件名:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -13045,352 +15535,381 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">错误:%s\n"
 "请检查插件网站中的更新。</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "配置插件(_U)"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>插件细节</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "选择文件"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "监视对象"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "离开(_W)"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "回来(_U)"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "发起了呆(_I)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "发完了呆(_D)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "开始打字(_T)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "输入时暂停(_A)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "停止打字(_Y)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "发送消息(_M)"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "打开即时消息窗口(_N)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "弹出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "发送消息(_M)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "执行命令(_X)"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "播放声音(_L)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "浏览(_E)..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "浏览(_O)..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "预览(_V)"
 
-#: ../pidgin/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
+#: ../pidgin/gtkpounce.c:798
+#, fuzzy
+msgid "P_ounce only when my status is not Available"
 msgstr "仅当我的状态不可用时才监视(_O)"
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "再现(_R)"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "监视目标"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:386
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+#, fuzzy
+msgid "Default"
+msgstr "GNOME 默认"
+
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "表情主题解包失败。"
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:644
+msgid "Install Theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:697
 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 "请从下面选择您要使用的表情主题。将主题拖曳到主题列表即可安装新主题。"
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "图标"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "系统托盘图标"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "显示系统托盘图标(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "总是"
-
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "有未读消息时"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "对话窗口隐藏"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "隐藏新的 IM 对话(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "离开时"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "标签"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "在标签上显示关闭按钮(_U)"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "放置(_P):"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "上"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "下"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "左"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "右"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "左侧垂直"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "右侧垂直"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "新建对话(_E):"
 
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "收到的消息显示格式(_F)"
 
-#: ../pidgin/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "显示好友图标(_I)"
-
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:998
+#, fuzzy
+msgid "Show _detailed information"
+msgstr "显示登录信息"
+
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "启用好友图标动画(_O)"
 
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "提醒好友您正在打字给他们(_N)"
 
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "突出显示拼错的单词(_M)"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "使用平滑滚动"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr "收到信息时闪烁窗口(_L)"
 
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:1019
+#, fuzzy
+msgid "Minimi_ze new conversation windows"
+msgstr "升起对话窗口(_A)"
+
+#: ../pidgin/gtkprefs.c:1023
+#, fuzzy
+msgid "Font"
+msgstr "字体"
+
+#: ../pidgin/gtkprefs.c:1025
+msgid "Use document font from _theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1027
+msgid "Use font from _theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1029
+#, fuzzy
+msgid "Conversation _font:"
+msgstr "对话项"
+
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "默认格式"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:1062
+#, fuzzy
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "STUN 服务器(_U):"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "自动检测 IP 地址(_A)"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "公网 _IP:"
 
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "端口"
 
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
 
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "起始端口(_S):"
 
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "终止端口(_E):"
 
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "无代理"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1331
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1333
 msgid "GNOME Default"
 msgstr "GNOME 默认"
 
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "手动"
 
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "浏览器(_B):"
 
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "打开链接的方式(_O):"
 
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "浏览器默认"
 
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "现有窗口"
 
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "新建标签"
 
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13399,75 +15918,69 @@
 "手动(_M):\n"
 "(%s 代表 URL)"
 
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "日志格式(_F):"
 
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr "记录所有即时消息(_I)"
 
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "记录所有聊天(_H)"
 
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "将全部状态都记录到系统日志中(_S)"
 
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "声音选择"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr "最小"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr "较小"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "小"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr "大"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr "较大"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr "最大"
 
-#: ../pidgin/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "声音方式"
-
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "控制台响铃"
 
-#: ../pidgin/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "自动"
-
-#: ../pidgin/gtkprefs.c:1604
-msgid "Command"
-msgstr "命令"
-
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "无声音"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13476,180 +15989,145 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#: ../pidgin/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "声音选项"
-
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "启用声音:"
 
-#: ../pidgin/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "仅当可用时"
-
-#: ../pidgin/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "仅当不可用时"
-
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "声音事件"
-
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1739
-msgid "Event"
-msgstr "事件"
-
-#: ../pidgin/gtkprefs.c:1758
-msgid "Test"
-msgstr "测试"
-
-#: ../pidgin/gtkprefs.c:1762
-msgid "Reset"
-msgstr "重置"
-
-#: ../pidgin/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "选择..."
-
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "报告发呆时间(_R):"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "根据键盘或鼠标使用"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "自动回复(_A):"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "离开和发呆时"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "自动离开"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "发呆时更改状态(_I)"
 
-#: ../pidgin/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1957
+#, fuzzy
+msgid "_Minutes before becoming idle:"
 msgstr "更改状态前等几分钟(_M):"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "将状态更改为(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "启动时的状态"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "启动时使用上次退出时的状态(_E)"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "启动时应用的状态(_P):"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr "界面"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "表情主题"
 
-#: ../pidgin/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "声音"
-
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "浏览器"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "状态/发呆"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "允许所有用户联系我"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "只允许我的好友"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "只允许以下用户"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "屏蔽全部用户"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "只屏蔽以下用户"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "隐私"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "对隐私设置的更改将会立即生效。"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "设置隐私的账户:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "允许用户"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "输入允许联系您的用户。"
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "允许(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "允许 %s 联系您吗?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您真的想要允许 %s 联系您吗?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "屏蔽用户"
 
@@ -13661,204 +16139,161 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "请输入您想要屏蔽的用户名称。"
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s 吗?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您真的想要屏蔽 %s 吗?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "应用"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "该文件已存在"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "您是否想要覆盖?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "选择新名称"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "选择文件夹..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr "房间列表"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "获取列表(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "添加聊天(_A)"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "您真的想要删除选中的已存状态吗?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "标题已在使用中。您必须选择唯一的标题。"
 
-#: ../pidgin/gtksavedstatuses.c:913
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "不同"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "标题(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "状态(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "为某些账户使用不同的状态(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "保存并使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "%s 的状态"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "好友登入"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "好友登出"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "消息已收到"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "收到的消息开始对话"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "消息已送出"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "有人进入聊天"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "有人离开聊天"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "您在聊天中发言"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "别人在聊天中发言"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "别人在聊天中提到您的名字"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer 失败"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer 初始化失败。"
-
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:632
+msgid "Google Talk"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "装入 %s 时发生了下列错误: %s。"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "装入图像失败"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "无法发送文件夹 %s。"
 
-#: ../pidgin/gtkutils.c:1421
-#, c-format
+#: ../pidgin/gtkutils.c:1499
+#, fuzzy, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
+"individually."
 msgstr "%s 无法传送文件夹。您需要选择需要传送的单个文件"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "您拖曳了图像"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
-#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "设置为好友头像"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "发送图像文件"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "在消息中插入"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您是否想要将其设置为此用户的头像?"
 
-#: ../pidgin/gtkutils.c:1468
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
-"标。"
-
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1551
+#, fuzzy
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
+
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -13869,11 +16304,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -13881,7 +16316,7 @@
 "您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
 "非启动器自身。"
 
-#: ../pidgin/gtkutils.c:2291
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -13892,91 +16327,109 @@
 "<b>文件大小:</b> %s\n"
 "<b>图像大小:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "图标错误"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "无法设定图标"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "打开文件“%s”:%s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "保存文件"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "选择颜色"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "别名(_A)"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "关闭标签(_T)"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "获得信息(_G)"
 
+#: ../pidgin/pidginstock.c:92
+msgid "_Invite"
+msgstr "邀请(_I)"
+
 #: ../pidgin/pidginstock.c:93
-msgid "_Invite"
-msgstr "邀请(_I)"
+msgid "_Modify"
+msgstr "修改(_M)"
 
 #: ../pidgin/pidginstock.c:94
-msgid "_Modify"
-msgstr "修改(_M)"
-
-#: ../pidgin/pidginstock.c:95
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+#, fuzzy
+msgid "Pidgin smileys"
+msgstr "Pidgwin 选项"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+#, fuzzy
+msgid "none"
+msgstr "(无)"
+
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "显示统计"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "响应可能性:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "统计配置"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "最大响应超时:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分钟"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "阀值:"
 
@@ -13986,18 +16439,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "联系人状态预测"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "联系人状态预测插件。"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14048,20 +16501,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "联系人优先级"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "允许控制好友不同状态所对应的值。"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14095,7 +16548,7 @@
 msgid "Received Messages"
 msgstr "收到的消息"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "选择 %s 的颜色"
@@ -14120,11 +16573,18 @@
 msgid "Conversation Placement"
 msgstr "交谈放置"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "每个窗口的对话数"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "按数字放置时分离即时消息和聊天窗口"
 
@@ -14134,54 +16594,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "扩展放置"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "额外的对话放置选项。"
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin 演示插件"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "一个范例插件 - 参看描述。"
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"这个插件非常酷,它可以完成以下功能:\n"
-"- 在您登入后告诉您谁写的这个程序\n"
-"- 颠倒所有收到的文本\n"
-"- 当您的好友登入后立即给他们发送信息"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14206,19 +16636,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "鼠标手势"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14239,67 +16669,72 @@
 msgstr "即时通讯"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
 
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+msgid "Group:"
+msgstr "组:"
+
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "新建联系人"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "选择好友"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "用户资料(_D)"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "关联好友(_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "无法发送电子邮件。"
-
 #: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "无法发送电子邮件。"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Evolution 可执行文件未在 PATH 中找到。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "此好友未发现电子邮件地址。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "添加到地址簿"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "发送电子邮件"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 集成配置"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "选择要将好友自动添加到哪些账户。"
 
@@ -14309,7 +16744,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution 集成"
 
@@ -14317,37 +16752,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "提供与 Evolution 的集成。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "账户类型:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "额外信息:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "名:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "姓:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "电子邮件:"
 
@@ -14370,6 +16805,13 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "测试看看所有的 UI 信号是否都工作正确。"
 
+#: ../pidgin/plugins/gtkbuddynote.c:36
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr "好友备注"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "历史"
@@ -14418,11 +16860,11 @@
 msgid "Draw Markerline in "
 msgstr ""
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "聊天窗口(_H)"
 
@@ -14436,32 +16878,32 @@
 msgid "Music messaging session confirmed."
 msgstr "音乐信使会话已确认。"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "音乐信使"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "运行命令时发生了冲突:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "运行编辑器出错"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "发生了下列错误:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "音乐信使配置"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "计分编辑器路径"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -14473,86 +16915,86 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "合作作曲的音乐信使插件。"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "提醒"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t仅当别人在聊天中提到您的名字(_O)"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "在窗口标题前追加字符串(_S):"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "在窗口标题中插入新消息数(_O)"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "在 X 属性中插入新消息数(_X)"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "通知删除"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "对话窗口获得焦点后即删除(_G)"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "单击对话窗口后即删除(_R)"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "在对话窗口中打字后即删除(_T)"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "消息送出后即删除(_M)"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "切换对话标签后即删除(_B)"
 
@@ -14562,7 +17004,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "消息通知"
 
@@ -14570,10 +17012,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供各种方法通知您有未读消息。"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin 演示插件"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "一个范例插件 - 参看描述。"
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"这个插件非常酷,它可以完成以下功能:\n"
+"- 在您登入后告诉您谁写的这个程序\n"
+"- 颠倒所有收到的文本\n"
+"- 当您的好友登入后立即给他们发送信息"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "光标颜色"
@@ -14586,89 +17058,102 @@
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 扩展柄大小"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平分隔"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "对话项"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "日志查看器"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "请求对话框"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "提醒对话框"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView 缩进扩展柄"
-
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "选择颜色"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+#, c-format
+msgid "Select Interface Font"
+msgstr "选择界面字体"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "选择 %s 的字体"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "选择界面字体"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ 界面字体"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "界面颜色"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "部件大小"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "字体"
 
-#: ../pidgin/plugins/pidginrc.c:576
-msgid "Tools"
-msgstr "工具"
-
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "将设置写入 %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "重新读取 gtkrc 文件"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 主题控制"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供对常用 gtkrc 设置的访问。"
 
@@ -14681,37 +17166,29 @@
 msgstr "允许您发送原样输入基于文本的协议。"
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+#, fuzzy
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
 "键可以发送。看看调试窗口。"
 
 #: ../pidgin/plugins/relnot.c:71
-#, c-format
-msgid "You are using %s version %s.  The current version is %s.<hr>"
+#, fuzzy, c-format
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
 msgstr "您正在使用 %s 版本 %s。当前版本为 %s。<hr>"
 
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+#: ../pidgin/plugins/relnot.c:79
+#, fuzzy, c-format
+msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 "<b>更新记录:</b>\n"
 "%s<br><br>"
 
-#: ../pidgin/plugins/relnot.c:82
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"您可以从下面的地址获得版本 %s:<br><a href=\"http://pidgin.sourceforge.net/"
-"\">http://pidgin.im</a>。"
-
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "新版本可用"
 
@@ -14721,86 +17198,86 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "定期检查新版本。"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr "定期检查新版本并通知用户更新记录。"
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "重复更正"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "指定的单词已经在更正列表中存在了。"
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "文字替换"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "输入文字"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "送出文字"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "整个单词"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "添加新的文字替换"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "输入文字(_T):"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "送出文字(_S):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "区分大小写匹配(不选中代表自动处理大小写)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "只替换整个单词(_W)"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "常规文本替换选项"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "允许在发送时替换最后一个单词"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "文本替换"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
@@ -14810,7 +17287,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "好友点点通"
 
@@ -14818,11 +17295,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友列表的水平滚动版本。"
 
-#: ../pidgin/plugins/timestamp.c:136
+#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "显示时间戳的间隔"
 
@@ -14832,19 +17309,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:195
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "时间戳"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:198
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "显示 iChat 风格的时间戳"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:200
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "每 N 分钟显示一次 iChat 风格的时间戳。"
 
@@ -14853,8 +17330,8 @@
 msgstr "时间戳格式选项"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
+#, fuzzy, c-format
+msgid "_Force 24-hour time format"
 msgstr "强制(传统 %s) 24小时制时间格式(_F)"
 
 #: ../pidgin/plugins/timestamp_format.c:33
@@ -14885,62 +17362,62 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "消息时间戳格式"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "自定义消息时间戳的格式。"
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "即时消息对话窗口"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "即时消息窗口透明度(_I)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "在即时消息窗口中显示滑块(_S)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "聚焦时取消即时通讯窗口透明度"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "常居顶端"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "好友列表窗口"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "好友列表窗口的透明度(_B)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "聚焦时取消好友列表窗口透明度"
 
@@ -14950,19 +17427,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "好友列表和对话窗口的可变透明度。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -14973,52 +17450,53 @@
 "\n"
 "* 注意: 此插件需要 Win2000 或更高版本。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ 运行时刻版本"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "启动"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "Windows 启动时运行 %s(_S)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "可停靠的好友列表(_D)"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "好友列表窗口常居顶端(_K):"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "仅停靠时"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "收到聊天信息时闪烁窗口(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#, fuzzy
+msgid "Windows Pidgin Options"
 msgstr "Pidgwin 选项"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项,比如好友列表停靠。"
 
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已注销。</font>"
 
@@ -15028,7 +17506,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
 #: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP 控制台"
@@ -15065,3 +17543,332 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "显示离线好友"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "端口"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "按状态"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "按日志大小"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "无法连接到服务器。"
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "选择 Notes 地址簿"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "当前令牌"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novell GroupWise Messenger 协议插件"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "失败: 身份验证失败"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s 刚刚给您发送了闪屏振动!"
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "未知错误"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "无法连接到服务器。"
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s 将状态从 %s 更改为 %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s 现在 %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s 不再 %s 了"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "消息(_M):"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "传送(_S)"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "添加好友千里眼(_P)"
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "离线时不允许"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "离线时不允许"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "添加好友"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "添加聊天"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "波斯语"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/账户(A)"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "账户:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "发送到(_S)"
+
+#~ msgid "Toggle offline buddies"
+#~ msgstr "切换离线好友"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "由于下列错误 %s 已经断开:\n"
+#~ "%s"
+
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "命令尚未支持。消息未送出。"
+
+#~ msgid "Timestamps"
+#~ msgstr "时间戳"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Autoreply"
+#~ msgstr "自动回复"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "设定 %s 的自动回复消息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "设定自动回复消息"
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "设定自动回复消息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自动回复消息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "发送自动回复消息的情况"
+
+#~ msgid "When my account is _away"
+#~ msgstr "当我的账户离开时(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "当我的帐户发呆时(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "默认回复(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "状态消息"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "最多次数(_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr "我目前不在。请给我留言,我会尽快给您回复。"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 账户"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "无法加入 %s:"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "在不提供密码的情况下服务器无法通过您的身份验证"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜索 Jabber 用户"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "无效的 Jabber ID"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "更改 Jabber 密码"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 协议插件"
+
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "您刚刚发送了闪屏振动!"
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "%s 的用户信息不可用:"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速度限制错误。"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "您已经登出了,原因未知。"
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到"
+#~ "了所允许的最大值。"
+
+#~ msgid "_Connect"
+#~ msgstr "连接(_C)"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "您真的想要退出此群吗?"
+
+#~ msgid "Go ahead"
+#~ msgstr "继续"
+
+#~ msgid "Server ACK"
+#~ msgstr "服务器响应"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "发送对话失败\n"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "保持在线出错,连接已丢失!"
+
+#~ msgid "Request login token error!"
+#~ msgstr "请求登录令牌出错!"
+
+#~ msgid "%s Address"
+#~ msgstr "%s 地址"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 在线"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: 离开"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: 隐身"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: 离线"
+
+#~ msgid "Modify My Information"
+#~ msgstr "修改我的信息"
+
+#~ msgid "Login in TCP"
+#~ msgstr "以 TCP 方式登录"
+
+#~ msgid "Login Hidden"
+#~ msgstr "隐身登录"
+
+#~ msgid "Socket send error"
+#~ msgstr "套接字发送错误"
+
+#~ msgid "Connection refused"
+#~ msgstr "连接被拒绝"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "您是否想要添加他?"
+
+#~ msgid "Reject watching by other users"
+#~ msgstr "拒绝其他用户监视"
+
+#~ msgid "Block invites"
+#~ msgstr "屏蔽邀请"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "拒绝在线状态属性请求"
+
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s 刚刚给您发送了闪屏振动!"
+
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "您刚刚发送了闪屏振动!"
+
+#~ msgid "Unavailable"
+#~ msgstr "不可用"
+
+#~ msgid "Alias..."
+#~ msgstr "别名..."
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具(T)/好友千里眼(P)"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/选项(O)/显示好友图标(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/选项(O)/显示好友图标(I)"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 开发者"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克语"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidwin<BR><BR>"
+
+#~ msgid "Smaller font size"
+#~ msgstr "较小字体"
+
+#~ msgid "Insert link"
+#~ msgstr "插入链接"
+
+#~ msgid "Insert image"
+#~ msgstr "插入图像"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "显示好友图标(_I)"
+
+#~ msgid ""
+#~ "You can send this image as a file transfer or embed it into this message, "
+#~ "or use it as the buddy icon for this user."
+#~ msgstr ""
+#~ "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友"
+#~ "图标。"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 扩展柄大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView 缩进扩展柄"
+
+#~ msgid "Tools"
+#~ msgstr "工具"
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "您可以从下面的地址获得版本 %s:<br><a href=\"http://pidgin.sourceforge.net/"
+#~ "\">http://pidgin.im</a>。"