im.pidgin.pidgin: aa344bd16b8d1f5425ea00a34d1f61fe65c21c6e

Wed Nov 14 08:11:56 EST 2007

-----------------------------------------------------------------
Revision: aa344bd16b8d1f5425ea00a34d1f61fe65c21c6e
Ancestor: b1dff2cb67992b2a7f45189ecf2531fd6affd943
Author: acli at ada.dhs.org
Date: 2007-11-14T12:51:02
Branch: im.pidgin.pidgin

Modified files:
        po/zh_TW.po

ChangeLog: 

fixes #3947

-------------- next part --------------
============================================================

--- po/zh_TW.po	2e8982e7253f7871ca58d600cdf13bd926cdc1cf
+++ po/zh_TW.po	141fab6666bf5ad21c373efbb28bdca5e8bd751a
@@ -1,9 +1,9 @@
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2007, Paladin R. Liu <paladin at ms1.hinet.net>
 # Copyright (C) 2003-2007, Ambrose C. Li <acli at ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.514 2007/10/23 06:03:34 acli Exp $
+# $InternalId: zh_TW.po,v 1.518 2007/11/14 05:19:25 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -48,9 +48,9 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.2.0\n"
-"POT-Creation-Date: 2007-10-21 03:21-0400\n"
-"PO-Revision-Date: 2007-10-23 01:55-0400\n"
+"Project-Id-Version: Pidgin 2.3.0\n"
+"POT-Creation-Date: 2007-11-12 03:23-0500\n"
+"PO-Revision-Date: 2007-11-13 23:55-0500\n"
 "Last-Translator: Ambrose C. Li <acli at ada.dhs.org>, Paladin R. Liu "
 "<paladin at ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n at linux.org.tw>\n"
@@ -93,7 +93,7 @@ msgstr ""
 "  -v, --version       é¡¯ç¤ºç‰ˆæœ¬è¨Šæ¯ä¸¦é›¢é–‹\n"
 
 #  NOTE ç¬¬äºŒã€ä¸‰å€‹ %s ä¿‚ç›®éŒ„åç¨±ï¼ˆä¸æ˜¯ç¨‹å¼åï¼‰
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -104,17 +104,17 @@ msgstr ""
 "ä¸¦é€éŽ http://developer.pidgin.im å›žå ±é€™å€‹éŒ¯èª¤ã€‚"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../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:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../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/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "éŒ¯èª¤"
@@ -145,7 +145,7 @@ msgstr "ï¼ˆå¤§æ¦‚æ˜¯å¿˜è¨˜äº†åŸ·è¡Œã€Œma
 msgstr "ï¼ˆå¤§æ¦‚æ˜¯å¿˜è¨˜äº†åŸ·è¡Œã€Œmake installã€äº†ã€‚ï¼‰"
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1474 ../pidgin/gtkblist.c:4367
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
 msgid "Modify Account"
 msgstr "ä¿®æ”¹å¸³è™Ÿ"
 
@@ -177,29 +177,33 @@ msgstr "åˆ¥åï¼š"
 #: ../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:2224 ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
-#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../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/account.c:1105 ../libpurple/account.c:1394
+#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../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/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
 #: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
 #: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -212,43 +216,43 @@ msgstr "åˆ¥åï¼š"
 #: ../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:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../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/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../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/silc10/silc.c:943
 #: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1909
-#: ../pidgin/gtkaccount.c:2496 ../pidgin/gtkblist.c:6321
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1047
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1117
-#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1214
-#: ../pidgin/gtkdialogs.c:1253 ../pidgin/gtkdialogs.c:1280
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1108
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6639
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
+#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
 #: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "å–æ¶ˆ"
@@ -256,15 +260,15 @@ msgstr "å–æ¶ˆ"
 #. Save button
 #. Save
 #: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../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
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "å„²å˜"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1901
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
 #: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -276,16 +280,16 @@ msgstr "åˆªé™¤å¸³è™Ÿ"
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1107 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
 #: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "åˆªé™¤"
 
 #: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2326 ../pidgin/gtkdocklet.c:715
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "å¸³è™Ÿæ¸…å–®"
 
@@ -295,54 +299,54 @@ msgstr "ä»¥ä¸‹åˆ—è¡¨çš„å¸³è™Ÿå¯éš¨æ„å•
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:883
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2379
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
 #: ../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:2495
-#: ../pidgin/gtkblist.c:6320 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6638 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "åŠ å…¥"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "ä¿®æ”¹"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2442
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, 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:884 ../pidgin/gtkaccount.c:2494
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "å°‡ä½¿ç”¨è€…åŠ å…¥æ‚¨çš„å¥½å‹æ¸…å–®ï¼Ÿ"
 
 #  NOTE: æœ€é çš„ %s%s%s%s æ˜¯å°æ–¹å¸³è™Ÿï¼Œæˆ–å¸³è™Ÿæ‹¬å¼§åˆ¥åï¼ˆç¬¬äºŒã€å››å€‹ %s æ˜¯æ‹¬å¼§ï¼‰
 #  NOTE: æœ€å°¾çš„ %s%s æ˜¯ç©ºç™½æˆ–ã€Œ: è¨Šæ¯ã€ï¼ŒåŸºæœ¬ä¸Šå¯ä»¥ä¸ç†æœƒï¼ˆä¹Ÿä¸èƒ½æ€Žæ¨£ç†æœƒï¼‰
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2552
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, 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:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "çµ¦äºˆèªè‰ï¼Ÿ"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "çµ¦äºˆèªè‰"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "æ‹’çµ•"
 
@@ -366,20 +370,21 @@ msgstr "æ–°å¢žå¥½å‹é€”ä¸ç™¼ç”Ÿäº†éŒ¯èª
 msgid "Error adding buddy"
 msgstr "æ–°å¢žå¥½å‹é€”ä¸ç™¼ç”Ÿäº†éŒ¯èª¤"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "å¸³è™Ÿ"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1509
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1022
-#: ../pidgin/gtkdialogs.c:1046 ../pidgin/gtkdialogs.c:1068
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "åˆ¥å"
 
@@ -390,22 +395,22 @@ msgstr "ç¾¤çµ„"
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
 #: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
 #: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3206
-#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1275
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
 #: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "å¸³è™Ÿ"
 
 #: ../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/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../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:3345 ../pidgin/gtkblist.c:5826
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6140
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "æ–°å¢žå¥½å‹"
@@ -422,12 +427,15 @@ msgstr "èŠå¤©"
 # NOTE åªèƒ½è¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
 #. Extract their Name and put it in
 #: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1690 ../libpurple/protocols/msn/msn.c:1755
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -437,7 +445,7 @@ msgstr "è‡ªå‹•åŠ å…¥"
 msgid "Auto-join"
 msgstr "è‡ªå‹•åŠ å…¥"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6208
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
 msgid "Add Chat"
 msgstr "æ–°å¢žèŠå¤©å®¤"
 
@@ -459,8 +467,8 @@ msgstr "é‚£å€‹ç¾¤çµ„å·²ç¶“å˜åœ¨"
 
 # TODO è«‹è¦†æŸ¥æ ¸å¯¦ï¼šæ˜¯ã€ŒåŠ å…¥ã€æŠ‘æˆ–ã€Œæ–°å¢žã€?
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6317
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
 msgid "Add Group"
 msgstr "åŠ å…¥ç¾¤çµ„"
 
@@ -488,16 +496,16 @@ msgstr "ä¿®æ”¹è¨å®š"
 msgstr "ä¿®æ”¹è¨å®š"
 
 # XXX 20070518
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "è³‡è¨Š"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "è®€å–ä¸..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "å–å¾—è³‡è¨Š"
@@ -507,9 +515,9 @@ msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰"
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
 #: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "å‚³é€æª”æ¡ˆ"
@@ -555,14 +563,14 @@ msgstr "ç¢ºèªç§»é™¤"
 msgstr "ç¢ºèªç§»é™¤"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "ç§»é™¤"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2886 ../pidgin/gtkblist.c:4610
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "å¥½å‹æ¸…å–®"
@@ -579,44 +587,49 @@ msgstr "åˆ‡æ›æ¨™è¨˜"
 msgstr "åˆ‡æ›æ¨™è¨˜"
 
 #. General
-#: ../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
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
 #: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../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:1517 ../libpurple/protocols/msn/msn.c:1693
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../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/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../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:3230
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "æš±ç¨±"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:354
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2927
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3258
-#: ../pidgin/gtkblist.c:3664 ../pidgin/gtkprefs.c:1927
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "é–’ç½®"
 
@@ -649,27 +662,25 @@ msgstr ""
 
 # XXX check
 #: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "æ–°å¢ž..."
 
 # NOTE é€™æ˜¯å¾ˆå·®çš„åŽŸæ–‡ï¼ŒæŒ‡ã€Œå·²å„²å˜ã€(Saved) çš„ã€Œç‹€æ…‹ã€:P
 # NOTE ä¸Šä¸‹æ–‡æœ‰ä¸€äº›å¸¸ç”¨(?)çš„ç‹€æ…‹åŠã€Œæ–°å¢žã€ï¼ˆæ–°å¢žä¸€å€‹ç‹€æ…‹ï¼‰ï¼Œå½ˆå‡ºçš„è¦–çª—ä¹Ÿæœ‰ã€Œæ–°å¢žã€ï¼Œå¯èƒ½æ‡‰è©²å«ã€Œç‹€æ…‹ä¸€è¦½ã€æˆ–è€…ã€Œç‹€æ…‹æ¸…å–®ã€ä¸€é¡žçš„â€¦â€¦
 #: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "ç‹€æ…‹æ¸…å–®..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "æ¨¡çµ„æ¸…å–®"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:766
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
 msgstr "æ–°å³æ™‚è¨Šæ¯"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€æƒ³è¦ç™¼é€å³æ™‚è¨Šæ¯å°è±¡çš„å¸³è™Ÿã€‚"
@@ -678,24 +689,28 @@ msgstr "è«‹è¼¸å…¥æ‚¨æ‰€æƒ³è¦ç™¼é€å³æ™
 #. Not masked?
 #. No hints?
 #: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../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
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
+#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
 #: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
 #: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../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/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
@@ -703,11 +718,10 @@ msgstr "è«‹è¼¸å…¥æ‚¨æ‰€æƒ³è¦ç™¼é€å³æ™
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4366
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:771
-#: ../pidgin/gtkdialogs.c:910 ../pidgin/gtkdialogs.c:1002
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:786 ../pidgin/gtkdialogs.c:925
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "ç¢ºå®š"
 
@@ -717,7 +731,7 @@ msgstr "é »é“"
 
 # TODO çœ‹èµ·ä¾†æ‡‰è©²ç‚ºåŠ ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œä¸¦æŠŠèŠå¤©å®¤æ¸é¡žåˆ°æŸå€‹ç¾¤çµ„ã€‚
 # NOTE è¯æ–‡æ›´å‹• by Paladin
-#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:924
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:940
 msgid "Join a Chat"
 msgstr "åŠ å…¥èŠå¤©å®¤"
 
@@ -730,7 +744,7 @@ msgstr "åŠ å…¥"
 msgstr "åŠ å…¥"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:797
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "é¸é …"
 
@@ -738,35 +752,35 @@ msgstr "é€å‡ºå³æ™‚è¨Šæ¯..."
 msgid "Send IM..."
 msgstr "é€å‡ºå³æ™‚è¨Šæ¯..."
 
-#: ../finch/gntblist.c:2334
+#: ../finch/gntblist.c:2335
 msgid "Join Chat..."
 msgstr "åŠ å…¥èŠå¤©å®¤..."
 
-#: ../finch/gntblist.c:2338
+#: ../finch/gntblist.c:2340
 msgid "Show"
 msgstr "é¡¯ç¤º"
 
-#: ../finch/gntblist.c:2343
+#: ../finch/gntblist.c:2345
 msgid "Empty groups"
 msgstr "ç©ºçš„ç¾¤çµ„"
 
-#: ../finch/gntblist.c:2349
+#: ../finch/gntblist.c:2352
 msgid "Offline buddies"
 msgstr "é›¢ç·šå¥½å‹"
 
-#: ../finch/gntblist.c:2355
+#: ../finch/gntblist.c:2359
 msgid "Sort"
 msgstr "æŽ’åº"
 
-#: ../finch/gntblist.c:2360
+#: ../finch/gntblist.c:2364
 msgid "By Status"
 msgstr "ä¾ç…§ç‹€æ…‹"
 
-#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4151
+#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
 msgid "Alphabetically"
 msgstr "ä¾ç…§å—æ¯"
 
-#: ../finch/gntblist.c:2368
+#: ../finch/gntblist.c:2374
 msgid "By Log Size"
 msgstr "ä¾ç…§æ—¥èªŒå¤§å°"
 
@@ -856,13 +870,13 @@ msgstr "ç¢ºå®šåˆªé™¤æ†‘è‰"
 msgid "Confirm certificate delete"
 msgstr "ç¢ºå®šåˆªé™¤æ†‘è‰"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
 msgstr "æ†‘è‰ç®¡ç†"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "ä¸»æ©Ÿåç¨±"
@@ -871,17 +885,18 @@ msgstr "ä¸»æ©Ÿåç¨±"
 # XXX javajsp (Ka-Hing CHEUNG) è¦‹éŽçš„ã€ŒInfoã€æŒ‰ç´å…¨éƒ½æ˜¯ã€Œå–å¾—ä½¿ç”¨è€…è³‡è¨Šã€
 # XXX æ³¨ï¼šç¾åœ¨ (2.0.0b4) ä¸æ˜¯äº†ï¼Œé™¤éŒ¯è¦–çª—çš„ã€ŒéŽæ¿¾ç¨‹åº¦ã€ç«Ÿæœ‰ã€ŒInfoã€ï¼ˆè³‡è¨Šï¼‰ç´šåˆ¥â€¦â€¦
 #: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "è³‡è¨Š"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
 #: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2469
-#: ../pidgin/gtkrequest.c:273
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "é—œé–‰"
 
@@ -907,50 +922,50 @@ msgstr ""
 "\n"
 "åœ¨æ‚¨æ›´æ£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼ŒFinch å°‡ä¸æœƒå†è©¦è‘—é‡æ–°é€£ç·šã€‚"
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4368
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "é‡æ–°å•Ÿå‹•å¸³è™Ÿ"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "ç„¡æ¤æŒ‡ä»¤ã€‚"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "èªžæ³•éŒ¯èª¤ï¼šè¼¸å…¥çš„åƒæ•¸å°‘æ–¼æŒ‡ä»¤æ‰€éœ€çš„åƒæ•¸æ•¸é‡ã€‚"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "æŒ‡ä»¤åŸ·è¡Œå¤±æ•—ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "é€™å€‹æŒ‡ä»¤åªåœ¨èŠå¤©å®¤å…§æœ‰æ•ˆï¼Œåœ¨å³æ™‚è¨Šæ¯ä¸ç„¡æ•ˆã€‚"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "é€™å€‹æŒ‡ä»¤åªåœ¨å³æ™‚è¨Šæ¯ä¸æœ‰æ•ˆï¼Œåœ¨èŠå¤©å®¤å…§ç„¡æ•ˆã€‚"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "é€™å€‹æŒ‡ä»¤åœ¨é€™å€‹é€šè¨Šå”å®šå…§ç„¡æ•ˆã€‚"
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr "å› ç‚ºæ‚¨ä¸¦æœªç™»å…¥ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
 # XXX é€™æ˜¯ä»€éº¼ï¼Ÿ
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -959,65 +974,65 @@ msgstr ""
 "\n"
 "%s æ£åœ¨è¼¸å…¥..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "æ‚¨é›¢é–‹äº†èŠå¤©å®¤ã€‚"
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "æ—¥èªŒç³»çµ±å•Ÿå‹•ã€‚æœªä¾†åœ¨é€™å€‹äº¤è«‡ä¸çš„è¨Šæ¯éƒ½å°‡è¢«è¨˜éŒ„æ–¼æ—¥èªŒä¸ã€‚"
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "æ—¥èªŒç³»çµ±é—œé–‰ã€‚æœªä¾†åœ¨é€™å€‹äº¤è«‡ä¸çš„è¨Šæ¯éƒ½å°‡ä¸æœƒè¢«è¨˜éŒ„æ–¼æ—¥èªŒä¸ã€‚"
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "å‚³é€åˆ°"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "äº¤è«‡"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "æ¸…ç©ºäº¤è«‡å…§å®¹"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "é¡¯ç¤ºæ™‚é–“æˆ³è¨˜"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
 msgstr "é–‹å§‹è¨˜éŒ„æ—¥èªŒ"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
 msgstr "å•Ÿå‹•éŸ³æ•ˆ"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<è‡ªå‹•å›žæ‡‰> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "ä½¿ç”¨è€…åˆ—è¡¨ï¼š\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "æ”¯æ´çš„é™¤éŒ¯é¸é …æœ‰ï¼šversion"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "æ²’æœ‰é€™å€‹æŒ‡ä»¤ï¼ˆå¯åœ¨é€™è£ä½¿ç”¨ï¼‰"
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:426
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1025,65 +1040,65 @@ msgstr ""
 "è¦ç²å¾—æŸä¸€æŒ‡ä»¤çš„èªªæ˜Žï¼Œè¼¸å…¥ã€Œ/help &lt;æŒ‡ä»¤&gt;ã€å³å¯ã€‚\n"
 "åœ¨é€™è£ï¼Œå¯ç”¨çš„æŒ‡ä»¤æœ‰ï¼š\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7688
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;è¨Šæ¯&gt;ï¼šå°‡æŒ‡å®šçš„è¨Šæ¯ç•¶æˆä¸€èˆ¬è¨Šæ¯æ£å¸¸é€å‡ºï¼Œè€Œéžç•¶ç‚ºæŒ‡ä»¤è™•ç†ã€‚"
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7691
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;è¦åŸ·è¡Œçš„å‹•ä½œ&gt;ï¼šæ¨¡ä»¿IRCï¼ŒåŸ·è¡Œä¸€å€‹å‹•ä½œã€‚"
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7694
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;é¸é …&gt;ï¼šå‘ç›®å‰çš„äº¤è«‡é€å‡ºä¸€äº›é™¤éŒ¯è³‡è¨Šã€‚"
 
 # XXX
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7697
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clearï¼šæ¸…ç©ºäº¤è«‡çš„å›žæ²ç·©è¡å€"
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7703
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;æŒ‡ä»¤&gt;ï¼šé¡¯ç¤ºæŸä¸€æŒ‡ä»¤çš„èªªæ˜Žã€‚"
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "usersï¼šé¡¯ç¤ºé€™å€‹èŠå¤©å®¤å…§çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "pluginsï¼šé¡¯ç¤ºã€Œæ¨¡çµ„ã€è¦–çª—"
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylistï¼šé¡¯ç¤ºå¥½å‹æ¸…å–®ã€‚"
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accountsï¼šé¡¯ç¤ºå¸³è™Ÿæ¸…å–®ã€‚"
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwinï¼šé¡¯ç¤ºé™¤éŒ¯è¦–çª—"
 
-#: ../finch/gntconv.c:1180
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefsï¼šé¡¯ç¤ºã€Œåå¥½è¨å®šã€è¦–çª—"
 
-#: ../finch/gntconv.c:1183
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statusesï¼šã€Œç‹€æ…‹æ¸…å–®ã€è¦–çª—"
 
 #: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "ç„¡æ³•é–‹å•Ÿæª”æ¡ˆã€‚"
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "é™¤éŒ¯è¦–çª—"
 
@@ -1091,7 +1106,7 @@ msgstr "é™¤éŒ¯è¦–çª—"
 #. * 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:292 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "æ¸…é™¤"
 
@@ -1099,7 +1114,7 @@ msgstr "éŽæ¿¾å™¨ï¼š"
 msgid "Filter:"
 msgstr "éŽæ¿¾å™¨ï¼š"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "æš«åœ"
 
@@ -1136,25 +1151,27 @@ msgstr "å‰©é¤˜"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:362
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../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:597 ../libpurple/protocols/msn/msn.c:604
-#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2715
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3302
-#: ../pidgin/gtkblist.c:3316 ../pidgin/gtkblist.c:3318
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "ç‹€æ…‹"
 
@@ -1199,7 +1216,8 @@ msgstr "å·²å®Œæˆ"
 msgid "Finished"
 msgstr "å·²å®Œæˆ"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:388
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "å‚³è¼¸ä¸"
 
@@ -1212,11 +1230,11 @@ msgstr "æ‚¨æ”¶åˆ°éƒµä»¶ï¼"
 msgid "You have mail!"
 msgstr "æ‚¨æ”¶åˆ°éƒµä»¶ï¼"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "ç™¼ä¿¡äºº"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "ä¸»é¡Œ"
 
@@ -1227,17 +1245,17 @@ msgstr[1] "%s (%s) æœ‰ %d å°æ–°éƒµä»¶ã€
 msgstr[0] "%s (%s) æœ‰ %d å°æ–°éƒµä»¶ã€‚"
 msgstr[1] "%s (%s) æœ‰ %d å°æ–°éƒµä»¶ã€‚"
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "æ–°éƒµä»¶"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "%s çš„è³‡è¨Š"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:949
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "å¥½å‹è³‡è¨Š"
 
@@ -1249,7 +1267,7 @@ msgstr "å³æ™‚è¨Šæ¯"
 msgid "IM"
 msgstr "å³æ™‚è¨Šæ¯"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "é‚€è«‹"
 
@@ -1258,19 +1276,19 @@ msgstr "(æ²’æœ‰åå—)"
 msgid "(none)"
 msgstr "(æ²’æœ‰åå—)"
 
-#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "éŒ¯èª¤"
 
-#: ../finch/gntplugin.c:76
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "æ¨¡çµ„è¼‰å…¥å¤±æ•—"
 
-#: ../finch/gntplugin.c:85
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "æ¨¡çµ„å¸è¼‰å¤±æ•—"
 
-#: ../finch/gntplugin.c:130
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1287,40 +1305,40 @@ msgstr ""
 "ç¶²ç«™ï¼š%s\n"
 "æª”åï¼š%s\n"
 
-#: ../finch/gntplugin.c:188
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "è¨å®šæ¨¡çµ„å‰ï¼Œè«‹å…ˆè¼‰å…¥æ¨¡çµ„ã€‚"
 
-#: ../finch/gntplugin.c:236
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "æ¤æ¨¡çµ„ä¸¦ç„¡é¸é …å¯ä¾›è¨å®šã€‚"
 
-#: ../finch/gntplugin.c:257
+#: ../finch/gntplugin.c:259
 msgid "Error loading plugin"
 msgstr "è¼‰å…¥æ¨¡çµ„é€”ä¸éé‡éŒ¯èª¤"
 
-#: ../finch/gntplugin.c:258
+#: ../finch/gntplugin.c:260
 msgid "The selected file is not a valid plugin."
 msgstr "æ‰€æŒ‡å®šçš„æª”æ¡ˆä¸æ˜¯æœ‰æ•ˆçš„æ¨¡çµ„ã€‚"
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:261
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr "è«‹é–‹å•Ÿã€Œé™¤éŒ¯è¦–çª—ã€æª¢è¦–ç¢ºå¯¦çš„éŒ¯èª¤è¨Šæ¯ã€‚"
 
-#: ../finch/gntplugin.c:322
+#: ../finch/gntplugin.c:324
 msgid "Select plugin to install"
 msgstr "è«‹é¸æ“‡å¸Œæœ›å®‰è£çš„æ¨¡çµ„"
 
-#: ../finch/gntplugin.c:348
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "æ‚¨å¯é€éŽä»¥ä¸‹åˆ—è¡¨è¼‰å…¥æˆ–å¸è¼‰æ¨¡çµ„ã€‚"
 
-#: ../finch/gntplugin.c:399
+#: ../finch/gntplugin.c:401
 msgid "Install Plugin..."
 msgstr "å®‰è£æ¨¡çµ„..."
 
-#: ../finch/gntplugin.c:408
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "è¨å®šæ¨¡çµ„"
 
@@ -1329,188 +1347,188 @@ msgstr "è¨å®šæ¨¡çµ„"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2069
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "åå¥½è¨å®š"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "è«‹è¼¸å…¥ä¸€å€‹å¥½å‹ä»¥é€²è¡Œæ•æ‰ã€‚"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "ç·¨è¼¯å¥½å‹ç‹€æ…‹æ•æ‰"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "æ•æ‰èª°çš„ç‹€æ…‹"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "å¸³è™Ÿï¼š"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "å¥½å‹åç¨±ï¼š"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "æ•æ‰ç‹€æ…‹..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "ç™»å…¥"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "ç™»å‡º"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "é›¢é–‹"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "è¿”å›ž"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "é–’ç½®"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "ä¸å†é–’ç½®"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "é–‹å§‹è¼¸å…¥"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "æš«åœè¼¸å…¥"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "åœæ¢è¼¸å…¥"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "é€å‡ºä¸€å€‹è¨Šæ¯"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "åŸ·è¡Œå‹•ä½œ"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "é–‹å•Ÿå³æ™‚è¨Šæ¯è¦–çª—"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "å½ˆå‡ºé€šçŸ¥"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "é€å‡ºè¨Šæ¯"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "åŸ·è¡ŒæŒ‡ä»¤"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "æ’æ”¾éŸ³æ•ˆ"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "åªåœ¨æˆ‘çš„ç‹€æ…‹ä¸ç‚ºã€Œä¸Šç·šã€æ™‚å•Ÿç”¨"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1288
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "é‡è¦†ç™¼ç”Ÿ"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "ç„¡æ³•æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰"
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "æœªæœ‰è¨å®šä»»ä½•å¸³è™Ÿ"
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰å‰ï¼Œå¿…é ˆå…ˆæ–°å¢žä¸€å€‹å¸³è™Ÿã€‚"
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1103
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "æ‚¨ç¢ºå®šæ‚¨è¦åˆªé™¤å° %2$s çš„ %1$s æ•æ‰ï¼Ÿ"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1332
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "å¥½å‹ç‹€æ…‹æ•æ‰"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1459
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s é–‹å§‹è¼¸å…¥è¨Šæ¯çµ¦æ‚¨ (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1461
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s æš«åœè¼¸å…¥è¨Šæ¯çµ¦æ‚¨ (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1463
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s å·²ç¶“ç™»å…¥ (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1465
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ç”±é–’ç½®è¿”å›ž (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1467
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ç”±é›¢é–‹è¿”å›ž (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1469
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s åœæ¢è¼¸å…¥è¨Šæ¯çµ¦æ‚¨ (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s å·²ç¶“ç™»å‡º (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1473
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s è®Šæ›´ç‹€æ…‹ç‚ºé–’ç½® (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
 # XXX status like "Busy" (not necessarily "Away"), and "å·²ç¶“é›¢é–‹" seems misleading. - 20061123
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s å·²ç¶“é›¢é–‹ã€‚ (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1477
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s é€å‡ºä¸€å€‹è¨Šæ¯çµ¦æ‚¨ã€‚ (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
 msgstr "æœªçŸ¥çš„æ•æ‰äº‹ä»¶ã€‚è«‹å›žå ±é€™å€‹å•é¡Œï¼"
 
@@ -1518,12 +1536,12 @@ msgstr "ä»¥éµç›¤çš„ä½¿ç”¨ç‚ºåŸºæº–"
 msgid "Based on keyboard use"
 msgstr "ä»¥éµç›¤çš„ä½¿ç”¨ç‚ºåŸºæº–"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1932
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "å¾žä¸Šæ¬¡é€å‡ºè¨Šæ¯æ™‚ç‚ºåŸºæº–"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1931 ../pidgin/gtkprefs.c:1945
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "å¾žä¸"
@@ -1573,12 +1591,12 @@ msgstr "æ›´æ”¹ç‹€æ…‹ç‚º"
 msgstr "æ›´æ”¹ç‹€æ…‹ç‚º"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "äº¤è«‡"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1469 ../pidgin/gtkprefs.c:2046
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "æ—¥èªŒ"
 
@@ -1586,66 +1604,66 @@ msgstr "è©²åŠŸèƒ½å°šæœªå¯¦ä½œ"
 msgid "Not implemented yet."
 msgstr "è©²åŠŸèƒ½å°šæœªå¯¦ä½œ"
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "å„²å˜æª”æ¡ˆ..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "é–‹å•Ÿæª”æ¡ˆ..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "å¥½å‹ç™»å…¥"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "å¥½å‹ç™»å‡º"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "æ”¶åˆ°è¨Šæ¯"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "è¨Šæ¯æ”¶åˆ°ï¼Œé–‹å§‹é€²è¡Œäº¤è«‡"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "è¨Šæ¯é€å‡º"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "æœ‰äººé€²å…¥èŠå¤©å®¤"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "æœ‰äººé›¢é–‹èŠå¤©å®¤"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "æ‚¨åœ¨èŠå¤©å®¤èªªè©±"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "å…¶ä»–äººé€²å…¥èŠå¤©å®¤"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "æœ‰äººåœ¨èŠå¤©å®¤ä¸æåˆ°æ‚¨çš„åå—"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:308
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer éŒ¯èª¤"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:309
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer åˆå§‹åŒ–å¤±æ•—ã€‚"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1589
-#: ../pidgin/gtkprefs.c:1678 ../pidgin/gtkprefs.c:1874
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(é è¨)"
 
@@ -1661,7 +1679,7 @@ msgstr "å€‹äººè³‡æ–™"
 msgid "Profiles"
 msgstr "å€‹äººè³‡æ–™"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1719
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "è‡ªå‹•"
 
@@ -1669,7 +1687,7 @@ msgstr "å—¶ä¸€è²"
 msgid "Console Beep"
 msgstr "å—¶ä¸€è²"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1723
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "æŒ‡ä»¤"
 
@@ -1677,7 +1695,7 @@ msgstr "ç„¡éŸ³æ•ˆ"
 msgid "No Sound"
 msgstr "ç„¡éŸ³æ•ˆ"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1714
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "éŸ³æ•ˆæ’æ”¾æ–¹å¼"
 
@@ -1695,7 +1713,7 @@ msgstr ""
 "(è«‹ä»¥ %s ä»£è¡¨æª”å)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "éŸ³æ•ˆé¸é …"
 
@@ -1703,18 +1721,18 @@ msgstr "ç•¶äº¤è«‡å–å¾—è¼¸å…¥ç„¦é»žç™¼å‡
 msgid "Sounds when conversation has focus"
 msgstr "ç•¶äº¤è«‡å–å¾—è¼¸å…¥ç„¦é»žç™¼å‡ºéŸ³æ•ˆ"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1765 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../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:1763
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "ä¸Šç·šè€Œéžé›¢é–‹æœŸé–“"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1764
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "é›¢é–‹æœŸé–“"
 
@@ -1723,11 +1741,11 @@ msgstr "éŸ³é‡(0-100)ï¼š"
 msgstr "éŸ³é‡(0-100)ï¼š"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1800
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "äº‹ä»¶éŸ³æ•ˆ"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1859
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "äº‹ä»¶"
 
@@ -1735,15 +1753,15 @@ msgstr "æª”æ¡ˆ"
 msgid "File"
 msgstr "æª”æ¡ˆ"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "æ¸¬è©¦"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1882
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "é‡ç½®"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1886
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "é¸æ“‡..."
 
@@ -1765,7 +1783,8 @@ msgstr "ç‹€æ…‹æ¸…å–®"
 #: ../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:1486
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "è·éŠœ"
@@ -1784,44 +1803,44 @@ msgstr "æ ¼å¼"
 #. 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:270
-#: ../libpurple/protocols/bonjour/bonjour.c:277
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../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/msn/msn.c:635 ../libpurple/protocols/msn/msn.c:642
-#: ../libpurple/protocols/msn/msn.c:649 ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/msn/msn.c:662 ../libpurple/protocols/msn/msn.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:274
+#: ../libpurple/protocols/bonjour/bonjour.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2855
 #: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5608
-#: ../libpurple/protocols/oscar/oscar.c:5826
-#: ../libpurple/protocols/oscar/oscar.c:5840
-#: ../libpurple/protocols/oscar/oscar.c:5856
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/oscar/oscar.c:5870
-#: ../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/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "è¨Šæ¯"
 
@@ -1875,7 +1894,7 @@ msgstr "æ†‘è‰"
 msgid "Certificates"
 msgstr "æ†‘è‰"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "éŸ³æ•ˆ"
 
@@ -2029,75 +2048,74 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "å¸³è™Ÿæ¸…å–®"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "ç™»å…¥æ™‚éœ€è¦å¯†ç¢¼ã€‚"
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "è¼¸å…¥ %s (%s) çš„å¯†ç¢¼"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "è¼¸å…¥å¯†ç¢¼"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "å„²å˜å¯†ç¢¼"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "æ‰¾ä¸åˆ° %s çš„å”å®šæ¨¡çµ„"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4363
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "é€£ç·šéŒ¯èª¤"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "æ–°å¯†ç¢¼ä¸¦ä¸ç›¸ç¬¦ã€‚"
 
 # NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "è«‹å¡«å¦¥æ•´ä»½è¡¨æ ¼æ‰€æœ‰çš„æ¬„ä½ã€‚"
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "èˆŠå¯†ç¢¼"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "æ–°å¯†ç¢¼"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "æ–°å¯†ç¢¼ï¼ˆå†æ¬¡ç¢ºèªï¼‰"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "ä¿®æ”¹ %s çš„å¯†ç¢¼"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "è«‹è¼¸å…¥æ‚¨ç›®å‰çš„å¯†ç¢¼ä»¥åŠå¸Œæœ›ä½¿ç”¨çš„æ–°å¯†ç¢¼ã€‚"
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "æ›´æ”¹ %s çš„å€‹äººè³‡è¨Š"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "è¨å®šä½¿ç”¨è€…è³‡è¨Š"
 
@@ -2108,18 +2126,18 @@ msgstr "è¨å®šä½¿ç”¨è€…è³‡è¨Š"
 # XXX libgaim/protocols/* - ã€ŒUnknownã€æŒ‡ä¸æ˜Žçš„å¥½å‹ç‹€æ…‹ï¼Œå¯èƒ½æ˜¯æŒ‡ã€Œä¸æ˜Žã€ï¼ˆé€šè¨Šç³»çµ±å›žå ±çš„ç‹€æ…‹æ˜¯ã€Œä¸æ˜Žã€ï¼‰
 # XXX                       æˆ–è€…ã€ŒæœªçŸ¥ã€ï¼ˆå‡ºç¾äº† Pidgin æœªè¦‹éŽçš„ç‹€æ…‹ä»£è™Ÿï¼‰
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:2030
 #: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "æœªçŸ¥"
 
 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
 #: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5716
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6030
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2157,34 +2175,34 @@ msgstr "æ ¸å¯¦å³æ£„æ†‘è‰"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:885
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
 msgstr "æ†‘è‰æ©Ÿæ§‹"
 
 #  TODO Untranslated - acli 20070913
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1053
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
 msgstr "SSL Peer å¿«å–"
 
 #. Make messages
-#: ../libpurple/certificate.c:1184
+#: ../libpurple/certificate.c:1185
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "æŽ¥å— %s çš„æ†‘è‰å—Žï¼Ÿ"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
 msgstr "æ ¸å¯¦ SSL æ†‘è‰"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1199
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
 msgstr "æŽ¥å—"
 
-#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1202 ../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
@@ -2192,7 +2210,7 @@ msgstr "æ‹’çµ•"
 msgid "Reject"
 msgstr "æ‹’çµ•"
 
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
 msgstr "æª¢è¦–æ†‘è‰(_V)"
 
@@ -2201,7 +2219,7 @@ msgstr "æª¢è¦–æ†‘è‰(_V)"
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2212,14 +2230,14 @@ msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr "ã€Œ%sã€å‡ºç¤ºçš„æ†‘è‰æ˜¯è‡ªç°½çš„ï¼Œç„¡æ³•è‡ªå‹•é€²è¡Œæ ¸å¯¦ã€‚"
 
-#: ../libpurple/certificate.c:1344
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "ã€Œ%sã€å‡ºç¤ºçš„æ†‘è‰éŠæ˜¯ç„¡æ•ˆçš„ã€‚"
@@ -2229,16 +2247,16 @@ msgstr "ã€Œ%sã€å‡ºç¤ºçš„æ†‘è‰éŠæ˜¯ç„¡
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
 msgstr "SSL æ†‘è‰éŒ¯èª¤"
 
-#: ../libpurple/certificate.c:1353
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
 msgstr "ç„¡æ•ˆçš„æ†‘è‰éˆ"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1373
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2246,12 +2264,12 @@ msgstr ""
 "ç„¡æ³•æ ¸å¯¦é€™å¼µæ†‘è‰ï¼Œå› ç‚ºæ‚¨æ²’æœ‰æ ¹æ†‘è‰æ©Ÿæ§‹æ†‘è‰ (root certificate) çš„è³‡æ–™åº«ã€‚"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1396
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "é€™å¼µæ†‘è‰è²ç¨±ç”±ä¸€æ‰€ Pidgin ä¸èªè˜çš„æ ¹æ†‘è‰æ©Ÿæ§‹ç°½ç™¼ã€‚"
 
-#: ../libpurple/certificate.c:1413
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2261,12 +2279,12 @@ msgstr ""
 "ã€Œ%sã€å‡ºç¤ºçš„æ†‘è‰éŠè²ç¨±å®ƒæ˜¯ç”±æŸæ†‘è‰æ©Ÿæ§‹ç°½ç™¼ï¼Œä½†å¯¦éš›ä¸Šå»æ²’æœ‰è©²æ†‘è‰æ©Ÿæ§‹çš„æœ‰æ•ˆç°½"
 "ç« ã€‚"
 
-#: ../libpurple/certificate.c:1422
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
 msgstr "æ†‘è‰æ©Ÿæ§‹çš„ç°½ç« æ˜¯ç„¡æ•ˆçš„"
 
 #. Make messages
-#: ../libpurple/certificate.c:1886
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2284,7 +2302,7 @@ msgstr ""
 "å¤±æ•ˆæ—¥æœŸï¼š%s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1895
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
 msgstr "æ†‘è‰è³‡è¨Š"
 
@@ -2306,10 +2324,12 @@ msgstr "+++ %s ç™»å‡º"
 msgid "+++ %s signed off"
 msgstr "+++ %s ç™»å‡º"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:363
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "æœªçŸ¥éŒ¯èª¤"
 
@@ -2781,58 +2801,54 @@ msgstr "(%s) %s <è‡ªå‹•å›žè¦†>ï¼š%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <è‡ªå‹•å›žè¦†>ï¼š%s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "æ‚¨ç›®å‰ä½¿ç”¨çš„æ˜¯ %sï¼Œä½†é€™æ¨¡çµ„éœ€è¦ %sã€‚"
 
-#: ../libpurple/plugin.c:380
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "é€™å€‹æ¨¡çµ„æœªæœ‰å®šç¾©å®ƒçš„ IDã€‚"
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "æ¨¡çµ„ä¸ç¬¦ %d (éœ€è¦ %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI ç‰ˆæœ¬ä¸ç¬¦ %d.%d.x (éœ€è¦%d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "æ¨¡çµ„ä¸¦æœªå¯¦ä½œæ‰€æœ‰å¿…è¦çš„åŠŸèƒ½"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "æ‰¾ä¸åˆ°éœ€è¦çš„æ¨¡çµ„ã€Œ%sã€ã€‚è«‹é‡æ–°å®‰è£é€™å€‹æ¨¡çµ„ä¹‹å¾Œé‡è©¦ã€‚"
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "ç„¡æ³•è¼‰å…¥æ¨¡çµ„"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "ç„¡æ³•è¼‰å…¥éœ€è¦çš„æ¨¡çµ„ã€Œ%sã€ã€‚"
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "ç„¡æ³•è¼‰å…¥æ‚¨æ‰€æä¾›çš„æ¨¡çµ„ã€‚"
 
-#: ../libpurple/plugin.c:677
+#: ../libpurple/plugin.c:663
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "é—œè¯æ¨¡çµ„ %s å¸è¼‰å¤±æ•—ã€‚"
+msgid "%s requires %s, but it failed to unload."
+msgstr "æ¨¡çµ„ã€Œ%sã€éœ€è¦æ¨¡çµ„ã€Œ%sã€ï¼Œä½†å¾Œè€…å¸è¼‰å¤±æ•—ã€‚"
 
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "å¸è¼‰æ¨¡çµ„é€”ä¸éé‡éŒ¯èª¤ã€‚"
-
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "è‡ªå‹•æŽ¥å—"
@@ -2866,14 +2882,15 @@ msgstr "å„²å˜(_S)"
 
 #: ../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:1456
-#: ../libpurple/protocols/oscar/oscar.c:2248
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/oscar.c:5995
-#: ../libpurple/protocols/oscar/oscar.c:6221
-#: ../libpurple/protocols/oscar/oscar.c:6291 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:527
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "å–æ¶ˆ(_C)"
 
@@ -2930,8 +2947,10 @@ msgstr ""
 "ç•¶å®Œæˆè‡ªå‹•æŽ¥å—æª”æ¡ˆå‚³è¼¸æ™‚è·³å‡ºè¦–çª—é€šçŸ¥\n"
 "ï¼ˆåªç™¼ç”Ÿåœ¨æœªèˆ‡å‚³é€è€…é€²è¡Œäº¤è«‡çš„æƒ…æ³ä¸‹ï¼‰"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1766
-#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "å‚™è¨»"
 
@@ -3385,25 +3404,31 @@ msgstr "æ‚¨å¯ä»¥åœ¨ã€Œå¥½å‹ç‹€æ…‹æ•æ
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:623
-#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "æ˜¯"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:623
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "å¦"
 
@@ -3475,7 +3500,7 @@ msgstr "æµ®ç¾ã€Œæœªåœå…ˆçŸ¥ã€çš„äº¤è«
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "ä¿¡è™Ÿæ¸¬è©¦"
 
@@ -3483,8 +3508,8 @@ msgstr "ä¿¡è™Ÿæ¸¬è©¦"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "æª¢æŸ¥å„ç¨®ä¿¡è™Ÿæ˜¯å¦éƒ½èƒ½æ£å¸¸é‹ä½œã€‚"
 
@@ -3652,53 +3677,55 @@ msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
 "LocalMessaging for more information."
-msgstr "æ‰¾ä¸åˆ° Apple çš„ Bonjour For Windows toolkitï¼Œè©³æƒ…è«‹åˆ°ç¶²å€ http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging æŸ¥é–± FAQ éƒ¨åˆ†ã€‚"
+msgstr ""
+"æ‰¾ä¸åˆ° Apple çš„ Bonjour For Windows toolkitï¼Œè©³æƒ…è«‹åˆ°ç¶²å€ http://developer."
+"pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging æŸ¥"
+"é–± FAQ éƒ¨åˆ†ã€‚"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:124
+#: ../libpurple/protocols/bonjour/bonjour.c:126
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "ç„¡æ³•æŽ¥æ”¶é€£å…¥çš„å³æ™‚è¨Šæ¯é€£ç·š\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:149
+#: ../libpurple/protocols/bonjour/bonjour.c:153
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "ç„¡æ³•èˆ‡è¿‘ç«¯çš„ mDNS ä¼ºæœå™¨å»ºç«‹é€£ç·šã€‚å®ƒåœ¨åŸ·è¡Œä¸å—Žï¼Ÿ"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/bonjour/bonjour.c:670
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:369
+#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "å"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:367
-#: ../libpurple/protocols/bonjour/bonjour.c:673
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "å§“"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/bonjour/bonjour.c:375
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
 #: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../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:374
-#: ../libpurple/protocols/bonjour/bonjour.c:679
+#: ../libpurple/protocols/bonjour/bonjour.c:378
+#: ../libpurple/protocols/bonjour/bonjour.c:683
 msgid "AIM Account"
 msgstr "AIM å¸³è™Ÿ"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/bonjour/bonjour.c:682
+#: ../libpurple/protocols/bonjour/bonjour.c:381
+#: ../libpurple/protocols/bonjour/bonjour.c:686
 msgid "XMPP Account"
 msgstr "XMPP å¸³è™Ÿ"
 
@@ -3712,22 +3739,22 @@ msgstr "XMPP å¸³è™Ÿ"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:481
-#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:485
+#: ../libpurple/protocols/bonjour/bonjour.c:487
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour å”å®šæ¨¡çµ„"
 
 #  XXX é€™åŽŸæ–‡å¾ˆå¥‡æ€ª - ambrose 20070414
 #  NOTE å°æ‡‰ evolution PO æª”ä¹‹è¯æ³•ï¼Œè©³è¦‹ä¸Šé¢ã€ŒLocal Addressbookã€æ¢
-#: ../libpurple/protocols/bonjour/bonjour.c:624
+#: ../libpurple/protocols/bonjour/bonjour.c:628
 msgid "Purple Person"
 msgstr "é€£çµ¡äºº"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../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/bonjour/bonjour.c:680
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3738,30 +3765,30 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s å·²ç¶“é—œé–‰é€™å€‹äº¤è«‡ã€‚"
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:662
-#: ../libpurple/protocols/bonjour/jabber.c:680
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:672
+#: ../libpurple/protocols/bonjour/jabber.c:690
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ï¼Œäº¤è«‡ç„¡æ³•é–‹å§‹ã€‚"
 
-#: ../libpurple/protocols/bonjour/jabber.c:585
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Cannot open socket"
 msgstr "ç„¡æ³•é–‹å•ŸSocket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:593
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Error setting socket options"
 msgstr "è¨å®š Socket é¸é …æ™‚éŒ¯èª¤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:617
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not bind socket to port"
 msgstr "ç„¡æ³•è¯çµ Socket åˆ°é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/bonjour/jabber.c:625
+#: ../libpurple/protocols/bonjour/jabber.c:635
 msgid "Could not listen on socket"
 msgstr "ç„¡æ³•ç›£è½ Socket"
 
@@ -3779,46 +3806,48 @@ msgid "Token Error"
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr "Token éŒ¯èª¤"
+msgstr "ç¬¦è¨˜éŒ¯èª¤"
 
 #: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr "ç„¡æ³•å–å¾— Tokenã€‚\n"
+msgstr "ç„¡æ³•å–å¾—ç¬¦è¨˜ã€‚\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "å„²å˜å¥½å‹æ¸…å–®..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "æ‚¨çš„å¥½å‹æ¸…å–®æ˜¯ç©ºçš„ï¼Œæ‰€ä»¥æ²’æœ‰è³‡æ–™è¢«å¯«å…¥æª”æ¡ˆä¸ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "ç„¡æ³•é–‹å•Ÿæª”æ¡ˆ"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "å¥½å‹æ¸…å–®å„²å˜æˆåŠŸï¼"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "ç„¡æ³•æŠŠ %s çš„å¥½å‹æ¸…å–®å¯«å…¥è‡³æª”æ¡ˆã€Œ%sã€"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "ç„¡æ³•è®€å…¥å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "è®€å–å¥½å‹æ¸…å–®..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "å¥½å‹æ¸…å–®è®€å–æˆåŠŸï¼"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "å„²å˜å¥½å‹æ¸…å–®..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "å¡«å¯«è¨»å†Šè³‡æ–™æ¬„ä½ã€‚"
 
@@ -3826,159 +3855,164 @@ msgstr "æ–°å¯†ç¢¼ä¸¦ä¸ç›¸ç¬¦ã€‚"
 msgid "Passwords do not match."
 msgstr "æ–°å¯†ç¢¼ä¸¦ä¸ç›¸ç¬¦ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "ç„¡æ³•è¨»å†Šæ–°å¸³è™Ÿã€‚éŒ¯èª¤ç™¼ç”Ÿã€‚\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "æ–°çš„ Gadu-Gadu å¸³è™Ÿå·²è¨»å†Š"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "è¨»å†ŠæˆåŠŸï¼"
 
-#: ../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
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "å¯†ç¢¼ï¼ˆå†æ¬¡è¼¸å…¥ï¼‰"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "è¼¸å…¥ç›®å‰çš„å¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "ç›®å‰å¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "è¨»å†Šæ–°çš„ Gadu-Gadu å¸³è™Ÿ"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "è«‹è¼¸å…¥ä»¥ä¸‹çš„æ¬„ä½"
 
-#: ../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:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "åŸŽå¸‚"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "å‡ºç”Ÿå¹´"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1695
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../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/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "æ€§åˆ¥"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "ç”·æ€§æˆ–å¥³æ€§"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "ç”·"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "å¥³"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "åªæœ‰ä¸Šç·š"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "æœå°‹å¥½å‹"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "è«‹åœ¨ä¸‹æ–¹è¼¸å…¥æ‚¨çš„æœå°‹æ¢ä»¶"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "å¡«åˆ°æ¬„ä½ä¸ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "æ‚¨ç›®å‰æ‰€æä¾›çš„å¯†ç¢¼èˆ‡æŒ‡å®šçš„å¸³è™Ÿä¸ç¬¦ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "ç„¡æ³•ä¿®æ”¹å¯†ç¢¼ã€‚éŒ¯èª¤ç™¼ç”Ÿã€‚\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "è®Šæ›´ Gadu-Gadu å¸³è™Ÿçš„å¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "å¯†ç¢¼ä¿®æ”¹æˆåŠŸï¼"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "èˆŠå¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "è«‹è¼¸å…¥æ‚¨çš„èˆŠå¯†ç¢¼åŠä½ çš„æ–°å¯†ç¢¼ï¼š"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "è®Šæ›´ Gadu-Gadu å¯†ç¢¼"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "é¸å–ä¸€å€‹èŠå¤©å®¤çµ¦å¥½å‹ï¼›%s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "æ–°å¢žåˆ°èŠå¤©å®¤..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/gg/gg.c:1010
 #: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5658
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3302 ../pidgin/gtkblist.c:3640
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
 #: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "é›¢ç·š"
 
-#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/gg/gg.c:1013
 #: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../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:2821
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "ä¸Šç·š"
@@ -3986,145 +4020,146 @@ msgstr "ä¸Šç·š"
 #. 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/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4562
-#: ../libpurple/protocols/oscar/oscar.c:5686
-#: ../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:3655
-#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1941
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
 msgid "Away"
 msgstr "é›¢é–‹"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2714
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "å¸³è™Ÿ"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "å"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "å‡ºç”Ÿå¹´"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "ç„¡æ³•é¡¯ç¤ºæœå°‹çµæžœã€‚"
 
 # FIXME é€™ä¸åƒå°ï¼Œè¦è¦†æŸ¥ - 20061028
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu å…¬å…±å—å…¸"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "æœå°‹çµæžœ"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "æ‰¾ä¸åˆ°ç¬¦åˆçš„ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "ç„¡æ³•ä¾ç…§æœå°‹æ¢ä»¶æ‰¾åˆ°ç›¸ç¬¦çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "ç„¡æ³•è®€å– Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "ä¸‹è¼‰å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "æ‚¨å·²å¾žä¼ºæœå™¨ä¸‹è¼‰å¥½å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "ä¸Šå‚³å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "æ‚¨çš„å¥½å‹æ¸…å–®å·²è¢«å˜æ”¾æ–¼ä¼ºæœå™¨ä¸Šã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "é€£ç·šå¤±æ•—ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "å°éŽ–"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "æ–°å¢žåˆ°èŠå¤©å®¤"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "è§£é™¤å°éŽ–"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "å°éŽ–"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "èŠå¤©å®¤åç¨±(_N)ï¼š"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "èŠå¤©éŒ¯èª¤"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "èŠå¤©å®¤åç¨±æ£åœ¨ä½¿ç”¨ä¸"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "å°šæœªé€£ç·šåˆ°ä¼ºæœå™¨ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "å°‹æ‰¾å¥½å‹..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "ä¿®æ”¹å¯†ç¢¼..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "ä¸Šå‚³å¥½å‹æ¸…å–®åˆ°ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "è‡ªä¼ºæœå™¨ä¸‹è¼‰å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "å°‡ä¼ºæœå™¨ä¸Šçš„å¥½å‹æ¸…å–®åˆªé™¤"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "å„²å˜å¥½å‹æ¸…å–®åˆ°æª”æ¡ˆä¸..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "è‡ªæª”æ¡ˆè®€å–å¥½å‹æ¸…å–®..."
 
@@ -4139,38 +4174,38 @@ msgstr "è‡ªæª”æ¡ˆè®€å–å¥½å‹æ¸…å–®..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu å”å®šæ¨¡çµ„"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "æ³¢è˜å»£å—æ¡è¿Žçš„å³æ™‚é€šè¨Šç¨‹å¼"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ä½¿ç”¨è€…"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "æœªçŸ¥çš„æŒ‡ä»¤ï¼š%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "ç¾åœ¨çš„ä¸»é¡Œç‚ºï¼š%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "æ²’æœ‰è¨å®šä¸»é¡Œ"
 
@@ -4204,85 +4239,83 @@ msgstr "%s çš„æ˜¯æ—¥è¨Šæ¯"
 msgid "MOTD for %s"
 msgstr "%s çš„æ˜¯æ—¥è¨Šæ¯"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2361
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "ä¼ºæœå™¨å·²åœæ¢é€£ç·š"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "é¡¯ç¤ºæ˜¯æ—¥è¨Šæ¯ (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../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 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "å¯†ç¢¼(_P)ï¼š"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 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:1280
-#: ../libpurple/protocols/msn/session.c:386
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
 #: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/novell/novell.c:2198
 #: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1732
-#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "é€£ç·šä¸"
 
 # XXX æš«è¯
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 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:318
-#: ../libpurple/protocols/simple/simple.c:465
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "ç„¡æ³•å»ºç«‹ Socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/irc/irc.c:430
 #: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "ç„¡æ³•é€£åˆ°ä¼ºæœå™¨"
 
 # NOTE OSCAR éŒ¯èª¤è¨Šæ¯æ‡‰å¯åƒé–± http://aimdoc.sourceforge.net/OSCARdoc/ï¼Œä½†åœ¨è©²ç«™å¾ˆé›£æ‰¾æ±è¥¿
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "è®€å–éŒ¯èª¤"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "ä½¿ç”¨è€…"
 
-#: ../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/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4297,55 +4330,57 @@ msgstr "ä¸»é¡Œ"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "IRC å”å®šæ¨¡çµ„"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "è¼ƒå¥½çš„ IRC å”å®šæ¨¡çµ„"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:6725
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1919
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "ä¼ºæœå™¨"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:6728
-#: ../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/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "ç·¨ç¢¼"
 
-#: ../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/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../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/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4354,8 +4389,8 @@ msgstr "ä½¿ç”¨è€…"
 msgid "Username"
 msgstr "ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "å§“å"
@@ -4364,7 +4399,7 @@ msgstr "å§“å"
 #. 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:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "ä½¿ç”¨ SSL"
 
@@ -4398,8 +4433,8 @@ msgstr " <i>(å·²é©—è‰)</i>"
 msgstr " <i>(å·²é©—è‰)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3715
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "æš±ç¨±"
@@ -4678,7 +4713,7 @@ msgstr "names [é »é“]ï¼šåˆ—å‡ºç›®å‰åœ¨
 msgstr "names [é »é“]ï¼šåˆ—å‡ºç›®å‰åœ¨é »é“ä¸çš„ä½¿ç”¨è€…æ¸…å–®ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2304
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;æ–°æš±ç¨±&gt;ï¼šæ”¹è®Šæ‚¨çš„æš±ç¨±ã€‚"
 
@@ -4800,91 +4835,90 @@ msgstr "CTCP PING å›žç”"
 msgid "CTCP PING reply"
 msgstr "CTCP PING å›žç”"
 
-#: ../libpurple/protocols/irc/parse.c:632
-#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../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/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "æœªçŸ¥éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "è‡¨æ™‚æŒ‡ä»¤å¤±æ•—"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "åŸ·è¡Œ"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "ç™»å…¥é€™å€‹ä¼ºæœå™¨éœ€è¦ä½¿ç”¨ TLS/SSLï¼Œä½†æ‰¾ä¸åˆ° TLS/SSL æ”¯æ´ã€‚"
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè‰"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr "%s éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè‰ã€‚å…è¨±ä¸¦ç¹¼çºŒé€²è¡Œèªè‰ï¼Ÿ"
 
-#: ../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
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "æ˜Žæ–‡èªè‰"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "ä¼ºæœå™¨ä¸¦ä¸æä¾›ä»»ä½•ä¸€ç¨®è¢«æ”¯æ´çš„èªè‰æ–¹å¼"
 
-#. This should never happen!
-#: ../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
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "ä¼ºæœå™¨é€ä¾†äº†ç„¡æ•ˆçš„å›žæ‡‰ã€‚"
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè‰ã€‚å…è¨±ä¸¦ç¹¼çºŒé€²è¡Œèªè‰ï¼Ÿ"
 
 # XXX å¥½åƒæœ‰äº›æ€ªï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "ä¼ºæœå™¨é€ä¾†äº†ç„¡æ•ˆçš„é©—è‰æŒ‘æˆ°"
 
 # NOTE OSCAR éŒ¯èª¤è¨Šæ¯æ‡‰å¯åƒé–± http://aimdoc.sourceforge.net/OSCARdoc/ï¼Œä½†åœ¨è©²ç«™å¾ˆé›£æ‰¾æ±è¥¿
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "SASL éŒ¯èª¤"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4903,7 +4937,7 @@ msgstr "å"
 msgstr "å"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -4934,7 +4968,7 @@ msgstr "éƒµéžå€è™Ÿ"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "åœ‹å®¶"
@@ -4962,16 +4996,17 @@ msgstr "è·è²¬"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1764
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "ç”Ÿæ—¥"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3314
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "æè¿°"
 
@@ -5098,7 +5133,7 @@ msgstr "é–‹å§‹ä¸²æµ"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "æª”æ¡ˆå‚³è¼¸"
 
@@ -5227,8 +5262,8 @@ 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/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5278,7 +5313,7 @@ msgstr "ä¸ç¹¼æ®µæª¢æŸ¥"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2921
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "ç›¸å®¹æ€§"
 
@@ -5288,17 +5323,17 @@ msgstr "ç›¸å®¹æ€§"
 # NOTE ç”¨ä»¥è¡¨ç¤ºåœ¨å¤šè™•åœ°æ–¹åŒæ™‚ç™»å…¥äº†çš„æƒ…å½¢ä¸‹ï¼Œç›®å‰çš„å¯¦åœ¨ä½ç½®
 # NOTE è¦‹ http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
 #: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "å„ªå…ˆæ¬¡åº"
 
@@ -5311,9 +5346,9 @@ msgstr "è‹±æ–‡åˆ¥å"
 msgstr "è‹±æ–‡åˆ¥å"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5368,7 +5403,7 @@ msgstr "ç™»å‡º"
 msgstr "ç™»å‡º"
 
 #: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "æƒ³èŠå¤©"
 
@@ -5377,10 +5412,10 @@ msgstr "é•·æ™‚é–“é›¢é–‹"
 msgstr "é•·æ™‚é–“é›¢é–‹"
 
 #: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5862
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 msgid "Do Not Disturb"
 msgstr "è«‹å‹¿æ‰“æ“¾"
 
@@ -5389,8 +5424,8 @@ msgstr "JID"
 msgstr "JID"
 
 #: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3726
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "å§“"
 
@@ -5399,7 +5434,7 @@ msgstr "ä»¥ä¸‹ç‚ºæœå°‹çµæžœ"
 msgstr "ä»¥ä¸‹ç‚ºæœå°‹çµæžœ"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2322
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5407,69 +5442,69 @@ msgstr ""
 "è«‹åœ¨é©ç”¨æ¬„ä½å¡«å¯«æœå°‹æ¢ä»¶ï¼Œä»¥ä¾¿æœå°‹æƒ³æ‰¾çš„è¯çµ¡äººã€‚æ³¨æ„ï¼šæ‰€æœ‰æ¬„ä½å‡æ”¯æ´ä»¥è¬ç”¨å—"
 "å…ƒ (%) æœå°‹"
 
-#: ../libpurple/protocols/jabber/buddy.c:2342
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "æŸ¥è©¢ç›®éŒ„ä¼ºæœå™¨å¤±æ•—"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
+#: ../libpurple/protocols/jabber/buddy.c:2353
 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:2377
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "ä¼ºæœå™¨æŒ‡ä»¤ï¼š%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "å¡«å…¥ä¸€å€‹æˆ–å¤šå€‹æ¬„ä½ï¼Œä»¥æœå°‹XMPPä½¿ç”¨è€…ã€‚"
 
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "é›»åéƒµä»¶"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "æœå°‹XMPPä½¿ç”¨è€…"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "æœå°‹"
 
 # NOTE OSCAR éŒ¯èª¤è¨Šæ¯æ‡‰å¯åƒé–± http://aimdoc.sourceforge.net/OSCARdoc/ï¼Œä½†åœ¨è©²ç«™å¾ˆé›£æ‰¾æ±è¥¿
-#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "ç„¡æ•ˆç›®éŒ„"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "é€²å…¥ä½¿ç”¨è€…ç›®éŒ„ã€‚"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "é¸æ“‡ä¸€å€‹ä½¿ç”¨è€…ç›®éŒ„ä»¥é€²è¡Œæœå°‹"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "æœå°‹ç›®éŒ„"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5346
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "èŠå¤©å®¤(_R)ï¼š"
@@ -5545,7 +5580,7 @@ msgstr "åœ¨éž MUC æ¨¡å¼çš„èŠå¤©å®¤å…§
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "è®€å–èŠå¤©å®¤æ¸…å–®æ™‚ç™¼ç”ŸéŒ¯èª¤"
@@ -5568,30 +5603,25 @@ msgstr "å°‹æ‰¾èŠå¤©å®¤"
 msgid "Find Rooms"
 msgstr "å°‹æ‰¾èŠå¤©å®¤"
 
-# XXX è¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "å°å·¥ä½œéšŽæ®µé€²è¡Œåˆå§‹åŒ–æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 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
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "å¯«å…¥éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "è®€å–éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2560
-#: ../libpurple/protocols/yahoo/yahoo.c:2592
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5600,153 +5630,154 @@ msgstr ""
 "ç„¡æ³•èˆ‡ä¼ºæœå™¨å»ºç«‹é€£ç·š:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "ç„¡æ³•å»ºç«‹ Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "XMPP å¸³è™Ÿç„¡æ•ˆ"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP å¸³è™Ÿç„¡æ•ˆï¼ŒåŸŸåæ˜¯å¿…é ˆè¨å®šçš„ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "æˆåŠŸè¨»å†Š %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
+#: ../libpurple/protocols/jabber/jabber.c:689
 #, c-format
 msgid "Registration to %s successful"
 msgstr "æˆåŠŸè¨»å†Š %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "è¨»å†ŠæˆåŠŸ"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "è¨»å†Šå¤±æ•—"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:719
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "æˆåŠŸç§»é™¤ %s çš„è¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
 msgstr "ç§»é™¤è¨»å†ŠæˆåŠŸ"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
 msgstr "ç§»é™¤è¨»å†Šå¤±æ•—"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "å·²ç¶“è¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "çœï¼å·ž"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "éƒµéžå€è™Ÿ"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../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:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "æ—¥æœŸ"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
 msgstr "ç§»é™¤è¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "è«‹å¡«å¯«ä»¥ä¸‹è³‡æ–™ä»¥æ›´æ–°æ‚¨çš„è¨»å†Šè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "ç‚ºæ‚¨çš„æ–°å¸³æˆ¶è¨»å†Šï¼Œè«‹å¡«å¯«ä¸‹åˆ—è³‡æ–™ï¼š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "è¨»å†Šæ–°çš„ XMPP å¸³æˆ¶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "è¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/jabber/jabber.c:1039
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "è®Šæ›´ %s ä¸Šçš„è¨»å†Šè³‡è¨Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1040
 #, c-format
 msgid "Register New Account at %s"
 msgstr "è¨»å†Šåœ¨ %s çš„æ–°å¸³è™Ÿ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
 msgstr "è®Šæ›´è¨»å†Šè³‡è¨Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
 msgstr "ç§»é™¤å¸³è™Ÿè¨»å†ŠéŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
 msgstr "ç§»é™¤å¸³è™Ÿè¨»å†ŠæˆåŠŸ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "ä¸²æµåˆå§‹ä¸"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS åˆå§‹ä¸"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:392
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "èªè‰ä¸"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "ä¸²æµé‡æ–°åˆå§‹ä¸"
 
-#: ../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/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5656
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "æœªèªè‰"
 
@@ -5755,198 +5786,170 @@ msgstr "æœªèªè‰"
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "å·²äº’ç›¸èªè‰"
 
 #  NOTE Jabber è¡“èªžï¼Œè¦‹ã€ŒBothã€æ¢
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "å·²èªè‰å°æ–¹ï¼ˆä½†ä»ç‰å¾…å°æ–¹èªè‰æ‚¨ï¼‰"
 
 # FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è¯
 #  NOTE gntnotify å—ç¾©ç‚ºã€Œç™¼ä¿¡äººã€
 #  NOTE Jabber è¡“èªžå—ç¾©è¦‹ã€ŒBothã€æ¢
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "å·²èªè‰å°æ–¹"
 
 #  NOTE Jabber è¡“èªžï¼Œè¦‹ã€ŒBothã€æ¢
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "å·²ç²å°æ–¹èªè‰"
 
 #  NOTE Jabber è¡“èªžï¼Œè¦‹ã€ŒBothã€æ¢
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "ç„¡ï¼ˆä½†æ£ç‰å¾…å°æ–¹èªè‰æ‚¨ï¼‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "ç„¡"
 
 #  NOTE Jabber è¡“èªžï¼Œè¦‹ã€ŒBothã€æ¢
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "èªè‰ç‹€æ…‹"
 
-#: ../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/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
 #: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "å¿ƒæƒ…"
 
+# NOTE from #pidgin, on 20070920:
+# NOTE (20æ™‚05åˆ†52ç§’) wing: what does "Current Media" in the new msn code mean?
+# NOTE (20æ™‚07åˆ†19ç§’) rekkanoryo: wing: it's more or less "Now Playing"
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "æ£åœ¨æ’æ”¾"
+
 # XXX è¦è¦†æŸ¥ - acli 20070914
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 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
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "å…è¨±ã€Œå—¶ã€åŠŸèƒ½"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 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
+#: ../libpurple/protocols/jabber/jabber.c:1649
 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
+#: ../libpurple/protocols/jabber/jabber.c:1650
 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
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
 msgstr "æ¨‚æ›²ç¨®é¡ž"
 
 # XXX è¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
 msgstr "æ¨‚æ›²è¨»é‡‹"
 
 # NOTE åƒè¦‹ http://www.xmpp.org/extensions/xep-0118.html
 # FIXME 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
 msgstr "æ¨‚æ›² ID"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1654
 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
+#: ../libpurple/protocols/jabber/jabber.c:1655
 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
+#: ../libpurple/protocols/jabber/jabber.c:1656
 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
-msgid "Allow Buzz"
-msgstr "å…è¨±ã€Œå—¶ã€åŠŸèƒ½"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "å¯†ç¢¼ä¿®æ”¹æˆåŠŸ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "æˆåŠŸä¿®æ”¹äº†æ‚¨çš„å¯†ç¢¼ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "ä¿®æ”¹å¯†ç¢¼æœŸé–“å‡ºç¾éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "èˆŠå¯†ç¢¼ï¼ˆå†æ¬¡ç¢ºèªï¼‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "ä¿®æ”¹ XMPP å¯†ç¢¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "è«‹è¼¸å…¥æ‚¨çš„æ–°å¯†ç¢¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6442
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "è¨å®šä½¿ç”¨è€…è³‡è¨Š..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6453
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "ä¿®æ”¹å¯†ç¢¼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "æœå°‹ä½¿ç”¨è€…..."
 
 # NOTE è¦‹ http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "å‚³é€ç¶²å€æ™‚ç™¼ç”Ÿäº†ä¸æ˜Žçš„éŒ¯èª¤"
 
@@ -5954,52 +5957,52 @@ msgstr "å‚³é€ç¶²å€æ™‚ç™¼ç”Ÿäº†ä¸æ˜Žçš
 #  NOTEï¼ˆå¤§æ¦‚ä¿‚æŒ‡ç™»å…¥ç”¨çš„ä½¿ç”¨è€…è‡ªå®šå—ä¸²ï¼‰æˆ–å·¥ä½œéšŽæ®µç™»å…¥ï¼Œä»¥è‡´ç„¡æ³•å˜å–
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "åç¨±æˆ–ä½å€è¡çª"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "è©²åŠŸèƒ½å°šæœªå¯¦ä½œ"
 
 #  NOTE Jabber éŒ¯èª¤ <forbidden/>ï¼Œæ„æ€æ£å¸¸ï¼ˆè¡¨ç¤ºæ¬Šé™ä¸å¤ ï¼‰
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "æ¬Šé™ä¸å¤ "
 
 #  NOTE Jabber éŒ¯èª¤ <gone/>ï¼Œè¡¨ç¤ºä½¿ç”¨è€…æˆ–ä¼ºæœå™¨æ›¾ç¶“ä¸Šç·šï¼Œå¾Œä¾†é›¢äº†ç·š
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "å·²é›¢ç·š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "ä¼ºæœå™¨å…§éƒ¨éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "é …ç›®æœªæ‰¾åˆ°"
 
 # FIXME è¯æ–‡è½ä¾†å¥½åƒæœ‰é»žæ€ª 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "ç•¸åž‹çš„ XMPP å¸³è™Ÿ"
 
 #  NOTE Jabber éŒ¯èª¤ <not-acceptable/>ï¼Œè¡¨ç¤ºæ‰€é€å‡ºçš„è¦æ±‚æœªèƒ½é”åˆ°ä¼ºæœå™¨æˆ–æ”¶ä»¶äººæ‰€è¨‚ä¸‹çš„
 #  NOTE æ¢ä»¶ï¼ˆä¾‹å¦‚è¨Šæ¯ä¸å«æœ‰ç¦å—ï¼‰ï¼Œä»¥è‡´ç„¡æ³•å˜å–
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "ç„¡æ³•æŽ¥å—"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "ä¸è¢«å…è¨±"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "å¿…é ˆä»˜æ¬¾"
 
@@ -6007,78 +6010,78 @@ msgstr "å¿…é ˆä»˜æ¬¾"
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTEã€Œæš«æ™‚ç„¡æ³•è¯çµ¡ã€æ‡‰è©²æ¯”ã€Œä¸å˜åœ¨ã€é€šé †
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "æš«æ™‚ç„¡æ³•è¯çµ¡æŽ¥æ”¶è€…"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "å¿…é ˆè¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "é ç«¯ä¼ºæœå™¨æœªæ‰¾åˆ°"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "é ç«¯ä¼ºæœå™¨é€¾æ™‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "ä¼ºæœå™¨è¶…è¼‰"
 
 #  NOTE Jabber éŒ¯èª¤ <service-unavailable/>ï¼Œè¡¨ç¤ºä¼ºæœå™¨æ”¶åˆ°ä¸€å€‹æ„ç¾©ä¸æ˜Žçš„æŒ‡ä»¤
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "ä¸æä¾›è©²é …æœå‹™"
 
 #  NOTE Jabber éŒ¯èª¤ <subscription-required/>ï¼Œè¡¨ç¤ºä½¿ç”¨ã€Œæœå‹™ã€å‰
 #  NOTE å¿…é ˆäº‹å…ˆå–å¾—ã€ŒSubscriptionã€ï¼ˆèªè‰ï¼‰
 #  NOTE è©³è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "å¿…é ˆèªè‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "æœªé æœŸçš„è¦æ±‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "èªè‰å–æ¶ˆ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "èªè‰å«éŒ¯èª¤çš„ç·¨ç¢¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "ç„¡æ•ˆçš„ authzid"
 
 # XXX è¦è¦†æŸ¥è¯æ–‡
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "ç„¡æ•ˆçš„èªè‰æ©Ÿåˆ¶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "èªè‰æ©Ÿåˆ¶å¤ªè–„å¼±äº†"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "èªè‰æš«æ™‚å¤±æ•—"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "èªè‰å¤±æ•—"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "ç„¡æ•ˆçš„ Namespace Prefix"
 
@@ -6088,222 +6091,222 @@ msgstr "ç„¡æ•ˆçš„ Namespace Prefix"
 # NOTE è¦‹ http://www.jabber.org/user/userguide.html
 # NOTE Jabber å”å®šä¸ Stanza Error çš„ä¸€ç¨®ï¼Œå³ <conflict/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "å·²ç¶“ä»¥æŒ‡å®šçš„ Resource åœ¨å…¶ä»–åœ°æ–¹ç™»å…¥"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "é€£ç·šå·²é€¾æ™‚"
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <host-gone/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "ä¼ºæœå™¨å·²ä¸å†æ”¯æ´æ‰€çµ¦å®šçš„ä¼ºæœå™¨åç¨±"
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <host-unknown/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "ä¸æ˜Žçš„ä¼ºæœå™¨åç¨±"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "éŒ¯èª¤çš„å®šå€"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "å¸³è™Ÿç„¡æ•ˆ"
 
 # FIXME å¿…é ˆè¦†æŸ¥è¯æ–‡
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "å‘½åç©ºé–“ç„¡æ•ˆ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "ç„¡æ•ˆçš„ XML"
 
 # XXX é€™æ˜¯æš«è¯ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
 # NOTE Jabber å”å®šä¸çš„ã€Œnonmatching-hostsã€
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "ä¸»æ©Ÿåç¨±ä¸ç›¸ä¹Ž"
 
 # XXX é€™æ˜¯æš«è¯ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²ã€‚ä¸éŽå¥½åƒçœŸçš„æœ‰äººé€™æ¨£å¯«ï¼Œå¤§æ¦‚æ²’æœ‰å¤ªå¤§çš„å•é¡Œ
 # NOTE Jabber å”å®š xmpp-core ä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <policy-violation/>
 # NOTE è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "é•åäº†æœå‹™æ”¿ç–"
 
 # NOTE Jabber å”å®š Stream Error çš„ä¸€ç¨®ï¼Œå³ <remote-connection-failed/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "ç„¡æ³•é€£ç·šè‡³èªè‰æ‰€éœ€çš„é ç«¯è³‡æº"
 
 # NOTE Jabber å”å®š Stream Error çš„ä¸€ç¨®ï¼Œå³ <resource-constraint/>
 # NOTE åœ¨é€™è£çš„ Resource ä¸€è©žèˆ‡ç™»å…¥æ™‚ä½¿ç”¨è€…æ‰€ç”¨çš„ Resource ä¸€è©žæ„ç¾©ä¸¦ä¸ç›¸åŒ
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "ä¼ºæœå™¨è³‡æºçŸç¼º"
 
 # NOTE Jabber å”å®š xmpp-core ä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <restricted-xml/>
 # NOTE è¦‹ http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML ä¸å˜åœ¨æœ‰ Jabber å”å®šä¸å®¹è¨±çš„ XML å…ƒç´ "
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <see-other-host/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "ä¼ºæœå™¨åœ¨èªè‰æœŸé–“è¦æ±‚äº†é‡æ–°å°Žå‘è‡³å¦ä¸€ä¼ºæœå™¨"
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <system-shutdown/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "ä¼ºæœå™¨ç›®å‰åœ¨é—œæ©Ÿä¸"
 
 # NOTE è¦‹ http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "å‚³é€ç¶²å€æ™‚ç™¼ç”Ÿäº†ä¸æ˜Žçš„éŒ¯èª¤"
 
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "ä¼ºæœå™¨ä¸æ”¯æ´çµ¦å®šçš„å—å…ƒç·¨ç¢¼"
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <unsupported-stanza-type/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "ä¼ºæœå™¨ä¸æ”¯æ´çµ¦å®šçš„æ®µè½é¡žåˆ¥ (Stanza Type)"
 
 # NOTE Jabber å”å®šä¸ Stream Error çš„ä¸€ç¨®ï¼Œå³ <unsupported-version/>
 # NOTE è¦‹ http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "ä¸æ”¯æ´çµ¦å®šçš„ XMPP ç‰ˆæœ¬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML æ–‡ä»¶æ ¼å¼æœ‰å•é¡Œ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "ä¸²æµéŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "ç„¡æ³•ç¦æ¢ä½¿ç”¨è€… %s"
 
 #  XXX æš«è¯ã€Œï¼ˆæœƒå“¡ï¼‰ç‰ç´šã€ - ambrose 20070415
 #  NOTE: Unknown affiliation æŒ‡ ownerã€adminã€memberã€outcastã€none äº”ç¨®ä»¥å¤–çš„å…¶ä»–ä¸æ˜Žæ•¸å€¼
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "ä¸æ˜Žçš„ç‰ç´šï¼šã€Œ%sã€"
 
 #  XXX æš«è¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "ç„¡æ³•å°‡ä½¿ç”¨è€… %s çš„ç‰ç´šè¨å®šç‚ºã€Œ%sã€"
 
 #  XXX æš«è¯ - ambrose 20070415
 #  NOTE: Unknown role æŒ‡ moderatorã€participantã€visitorã€none å››ç¨®ä»¥å¤–çš„å…¶ä»–ä¸æ˜Žæ•¸å€¼
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "ä¸æ˜Žçš„èº«ä»½ï¼šã€Œ%sã€"
 
 #  XXX æš«è¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "ç„¡æ³•å°‡ä½¿ç”¨è€… %2$s çš„èº«ä»½è¨å®šç‚ºã€Œ%1$sã€"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "ç„¡æ³•è¸¢å‡ºä½¿ç”¨è€… %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "ç„¡æ³• Ping ä½¿ç”¨è€… %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2203
-#: ../libpurple/protocols/jabber/jabber.c:2214
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "ç„¡æ³•ã€Œå—¶ã€ä½¿ç”¨è€… %s ï¼Œå› ç‚ºæ²’æœ‰æœ‰é—œå°æ–¹çš„ä»»ä½•è³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2209
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "ç„¡æ³•ã€Œå—¶ã€ä½¿ç”¨è€… %s ï¼Œå› ç‚ºå°æ–¹ç›®å‰å¯èƒ½é›¢ç·šã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2240
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "ç„¡æ³•ã€Œå—¶ã€ä½¿ç”¨è€… %s ï¼Œå› ç‚ºå°æ–¹çš„ç”¨æˆ¶ç«¯ä¸æ”¯æ´é€™å€‹åŠŸèƒ½ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2262
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
 msgid "Buzz"
 msgstr "å—¶ï¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:2263
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%sã€Œå—¶ã€äº†æ‚¨ä¸€è²"
 
 # XXX é€™æ˜¯æš«è¯ - acli 20070913
-#: ../libpurple/protocols/jabber/jabber.c:2264
-#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
 #, c-format
 msgid "Buzzing %s..."
 msgstr "æ£åœ¨çµ¦ %s ä¸€å€‹å—¶..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2296
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "configï¼šè¨å®šä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2300
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configureï¼šè¨å®šä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [èŠå¤©å®¤]ï¼šé›¢é–‹èŠå¤©å®¤ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2314
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "registerï¼šåŠ å…¥ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2320
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [æ–°ä¸»é¡Œ]ï¼šæª¢è¦–æˆ–ä¿®æ”¹èŠå¤©ä¸»é¡Œ"
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;ä½¿ç”¨è€…&gt; [èŠå¤©å®¤]ï¼šç¦æ¢æŸä½¿ç”¨è€…é€²å…¥èŠå¤©å®¤"
 
 #  XXX æš«è¯ã€Œï¼ˆæœƒå“¡ï¼‰ç‰ç´šã€ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2332
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6312,7 +6315,7 @@ msgstr ""
 "åœ¨é€™èŠå¤©å®¤å…§çš„ç‰ç´š"
 
 #  NOTE è¯æ–‡æ”¹å‹• by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2338
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6320,29 +6323,29 @@ msgstr ""
 "role &lt;ä½¿ç”¨è€…&gt; &lt;moderator|participant|visitor|none&gt;: è¨å®šä½¿ç”¨è€…åœ¨"
 "é€™èŠå¤©å®¤å…§çš„èº«ä»½ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;ä½¿ç”¨è€…&gt; [è¨Šæ¯]ï¼šé‚€è«‹ä½¿ç”¨è€…é€²å…¥èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;èŠå¤©å®¤&gt; [ä¼ºæœå™¨]ï¼šåŠ å…¥ä½æ–¼é€™å€‹ä¼ºæœå™¨çš„ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;ä½¿ç”¨è€…&gt; [èŠå¤©å®¤]ï¼šå°‡ä½¿ç”¨è€…å¾žèŠå¤©å®¤ä¸è¸¢å‡ºã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
+#: ../libpurple/protocols/jabber/jabber.c:2378
 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:2367
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;ï¼šPing ä¸€å€‹ä½¿ç”¨è€…/çµ„ä»¶/ä¼ºæœå™¨ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2372
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: çµ¦å¥½å‹ä¸€å€‹ã€Œå—¶ã€å¼•ä»–ï¼ˆå¥¹ï¼‰æ³¨æ„"
 
@@ -6362,36 +6365,36 @@ msgstr "XMPP å”å®šæ¨¡çµ„"
 msgstr "XMPP å”å®šæ¨¡çµ„"
 
 #. 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
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "åŸŸå"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "éœ€è¦ SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "å¼·è¿«ä½¿ç”¨èˆŠå¼ SSL (port 5223)"
 
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "å…è¨±ä½¿ç”¨æ˜Žæ–‡ï¼Œåœ¨æœªç¶“åŠ å¯†çš„ä¸²æµä¸Šé€²è¡Œèªè‰"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3283
-#: ../libpurple/protocols/simple/simple.c:1925
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 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/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3280
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "é€£çµä¼ºæœå™¨"
 
@@ -6400,68 +6403,68 @@ msgstr "%s å·²ç¶“é›¢é–‹é€™å€‹äº¤è«‡ã€‚"
 msgid "%s has left the conversation."
 msgstr "%s å·²ç¶“é›¢é–‹é€™å€‹äº¤è«‡ã€‚"
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "ç”± %s ç™¼å‡ºçš„è¨Šæ¯"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s æŠŠèŠå¤©ä¸»é¡Œè¨å®šç‚ºï¼š%s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "ä¸»é¡Œï¼š%s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "ç„¡æ³•å‚³é€è¨Šæ¯åˆ° %sï¼š%s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP è¨Šæ¯éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (ä»£ç¢¼ %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "XML åˆ†æžéŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/presence.c:423
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "ä¸æ˜Žçš„ä¸Šç·šç‹€æ…‹éŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/presence.c:504
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "å»ºç«‹æ–°èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/presence.c:506
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "æ‚¨æ£è¦å»ºç«‹ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œæ‚¨è¦è¨å®šå®ƒï¼Œé‚„æ˜¯ä½¿ç”¨é è¨å€¼ï¼Ÿ"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "è¨å®šèŠå¤©å®¤(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:513
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "ä½¿ç”¨é è¨å€¼(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:555
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "èŠå¤©å®¤ %s ç™¼ç”ŸéŒ¯èª¤"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "åŠ å…¥èŠå¤©å®¤ %s æ™‚ç™¼ç”ŸéŒ¯èª¤"
@@ -6551,23 +6554,20 @@ msgstr "é¸æ“‡ä¸€å€‹å‹•ä½œ"
 msgid "Select an action"
 msgstr "é¸æ“‡ä¸€å€‹å‹•ä½œ"
 
-# XXX ç›´è¯ã€Œå¥½å‹ä¼ºæœå™¨ã€å¥½åƒä¸å¤ªå¦¥
-#: ../libpurple/protocols/msn/contact.c:163
-msgid "Unable to connect to contact server"
-msgstr "ç„¡æ³•é€£ç·šåˆ°å¥½å‹è³‡è¨Šä¼ºæœå™¨ã€‚"
-
-#: ../libpurple/protocols/msn/contact.c:923
+#: ../libpurple/protocols/msn/contact.c:712
 msgid "Unable to retrieve MSN Address Book"
 msgstr "ç„¡æ³•è®€å– MSN é€šè¨ŠéŒ„"
 
 # XXX æš«è¯
 #: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "ç‚º %s (%s) çš„å¥½å‹æ¸…å–®é€²è¡ŒåŒæ¥åŒ–é€”ä¸å‡ºç¾å•é¡Œ"
 
 # XXX æš«è¯
 #: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6578,6 +6578,7 @@ msgstr ""
 
 # XXX æš«è¯
 #: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6586,104 +6587,129 @@ msgstr ""
 "%s åœ¨æœ¬åœ°ç«¯çš„å¥½å‹æ¸…å–®ï¼Œéƒ¤ä¸åœ¨ä¼ºæœå™¨ä¸Šï¼›æ‚¨è¦æ–°å¢žé€™å€‹å¥½å‹è‡³ä¼ºæœå™¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
 #: ../libpurple/protocols/msn/error.c:36
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "ç„¡æ³•è§£æžè¨Šæ¯"
 
 # NOTE MSN éŒ¯èª¤è¨Šæ¯è¦åƒé–± http://www.hypothetic.org/docs/msn2/reference/error_list.php
 #: ../libpurple/protocols/msn/error.c:41
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "èªžæ³•éŒ¯èª¤ï¼ˆå¯èƒ½æ˜¯ç”¨æˆ¶ç«¯çš„ Bugï¼‰"
 
 #: ../libpurple/protocols/msn/error.c:46
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "é›»åéƒµä»¶ä½å€ç„¡æ•ˆ"
 
 #: ../libpurple/protocols/msn/error.c:49
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "ä½¿ç”¨è€…ä¸å˜åœ¨"
 
 #: ../libpurple/protocols/msn/error.c:53
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "æ²’çµ¦äºˆå®Œæ•´é ˜åŸŸåç¨± (FQDN)"
 
 #: ../libpurple/protocols/msn/error.c:56
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "å·²ç¶“ç™»å…¥"
 
 #: ../libpurple/protocols/msn/error.c:59
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "å¸³è™Ÿç„¡æ•ˆã€‚"
 
 #: ../libpurple/protocols/msn/error.c:62
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "æš±ç¨±ç„¡æ•ˆ"
 
 #: ../libpurple/protocols/msn/error.c:65
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "å¥½å‹æ¸…å–®å·²æ»¿"
 
 #: ../libpurple/protocols/msn/error.c:68
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "å·²ç¶“åœ¨æ¸…å–®è£¡"
 
 #: ../libpurple/protocols/msn/error.c:72
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "ä¸åœ¨æ¸…å–®ä¸"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "ä½¿ç”¨è€…æ˜¯é›¢ç·šçš„"
 
 #: ../libpurple/protocols/msn/error.c:78
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "å·²ç¶“åœ¨é€™å€‹æ¨¡å¼ä¸"
 
 #: ../libpurple/protocols/msn/error.c:82
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "å·²ç¶“åœ¨ç›¸å°çš„æ¸…å–®ä¸"
 
 #: ../libpurple/protocols/msn/error.c:86
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "å¤ªå¤šç¾¤çµ„"
 
 #: ../libpurple/protocols/msn/error.c:89
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "ç¾¤çµ„ç„¡æ•ˆ"
 
 #: ../libpurple/protocols/msn/error.c:92
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "ä½¿ç”¨è€…ä¸åœ¨ç¾¤çµ„å…§"
 
 #: ../libpurple/protocols/msn/error.c:95
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "ç¾¤çµ„åç¨±éŽé•·"
 
 #: ../libpurple/protocols/msn/error.c:98
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "ç„¡æ³•ç§»é™¤ã€Œé›¶ã€è™Ÿç¾¤çµ„"
 
 #: ../libpurple/protocols/msn/error.c:103
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "å˜—è©¦å°‡ä¸€å€‹ä½¿ç”¨è€…åŠ å…¥ä¸å˜åœ¨çš„ç¾¤çµ„"
 
 #: ../libpurple/protocols/msn/error.c:107
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Switchboard å¤±æ•—"
 
 #: ../libpurple/protocols/msn/error.c:111
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "å‚³é€é€šçŸ¥å¤±æ•—"
 
 #: ../libpurple/protocols/msn/error.c:116
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "æ‰¾ä¸åˆ°æ‰€éœ€è¦çš„æ¬„ä½"
 
 #: ../libpurple/protocols/msn/error.c:120
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "FND çš„çµæžœæœ‰å¤ªå¤šåŒ¹é…"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Not logged in"
 msgstr "å°šæœªç™»å…¥"
@@ -6691,118 +6717,147 @@ msgstr "å°šæœªç™»å…¥"
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å˜åœ¨ã€é€šé †
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
 #: ../libpurple/protocols/msn/error.c:128
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨æœå‹™"
 
 #: ../libpurple/protocols/msn/error.c:131
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "è³‡æ–™åº«éŒ¯èª¤"
 
 #  XXX æš«è¯
 #: ../libpurple/protocols/msn/error.c:135
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "æŒ‡ä»¤è¢«åœç”¨"
 
 #: ../libpurple/protocols/msn/error.c:139
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "æª”æ¡ˆæ“ä½œéŒ¯èª¤"
 
 #: ../libpurple/protocols/msn/error.c:143
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "è¨˜æ†¶é«”åˆ†é…éŒ¯èª¤"
 
 #: ../libpurple/protocols/msn/error.c:147
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "éŒ¯èª¤çš„ CHL å€¼å‚³é€åˆ°äº†ä¼ºæœå™¨"
 
 #: ../libpurple/protocols/msn/error.c:152
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "ä¼ºæœå™¨å¿™ç¢Œ"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "ä¼ºæœå™¨ç›®å‰ä¸æä¾›æœå‹™"
 
 #: ../libpurple/protocols/msn/error.c:158
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "é»žå°é»žé€šçŸ¥ä¼ºæœå™¨æš«åœæœå‹™"
 
 #: ../libpurple/protocols/msn/error.c:162
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "è³‡æ–™åº«é€£çµéŒ¯èª¤"
 
 #: ../libpurple/protocols/msn/error.c:167
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "ä¼ºæœå™¨å°‡æš«åœæœå‹™"
 
 #: ../libpurple/protocols/msn/error.c:174
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "é€£ç·šé–‹å•ŸéŒ¯èª¤"
 
 #: ../libpurple/protocols/msn/error.c:179
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR åƒæ•¸æ˜¯æœªçŸ¥æˆ–æ˜¯ä¸å…è¨±çš„"
 
 #: ../libpurple/protocols/msn/error.c:183
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "ç„¡æ³•å¯«å…¥"
 
 #: ../libpurple/protocols/msn/error.c:186
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "å·¥ä½œéšŽæ®µè¶…è¼‰"
 
 #: ../libpurple/protocols/msn/error.c:190
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "ä½¿ç”¨è€…å¤ªéŽæ´»èº"
 
 #: ../libpurple/protocols/msn/error.c:193
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "å¤ªå¤šå·¥ä½œéšŽæ®µ"
 
 #: ../libpurple/protocols/msn/error.c:196
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "è·ç…§å¸³è™Ÿå°šæœªç¶“éŽé©—è‰"
 
 #: ../libpurple/protocols/msn/error.c:199
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "å¥½å‹æª”æ¡ˆç„¡æ•ˆ"
 
 # NOTE åƒé–±ä¸Šåˆ—ç¶²ç«™ (www.hypothetic.org) ç¬¬715è™ŸéŒ¯èª¤
 #: ../libpurple/protocols/msn/error.c:203
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "æ²’æœ‰é æœŸçš„ç„¡æ•ˆåƒæ•¸"
 
 #: ../libpurple/protocols/msn/error.c:209
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "æš±ç¨±çš„è®Šæ›´éŽæ–¼æ€¥é€Ÿ"
 
 #: ../libpurple/protocols/msn/error.c:218
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "ä¼ºæœå™¨å¤ªå¿™ç¢Œ"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1383
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "èªè‰å¤±æ•—"
 
 #: ../libpurple/protocols/msn/error.c:225
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "åœ¨é›¢ç·šæ™‚ä¸å…è¨±é€™å€‹æŒ‡ä»¤"
 
 #: ../libpurple/protocols/msn/error.c:233
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "ä¸æŽ¥å—æ–°çš„ä½¿ç”¨è€…"
 
 #: ../libpurple/protocols/msn/error.c:237
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "æœªç¶“å®¶é•·åŒæ„ä¸‹ä½¿ç”¨å…’ç«¥è·ç…§"
 
 #: ../libpurple/protocols/msn/error.c:241
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "è·ç…§å¸³è™Ÿå°šæœªç¶“éŽé©—è‰"
 
@@ -6810,65 +6865,68 @@ msgstr "è·ç…§å¸³è™Ÿå°šæœªç¶“éŽé©—è‰"
 #  NOTE MSN éŒ¯èª¤ä»£è™Ÿ 928
 #  NOTE è©³è¦‹ http://www.hypothetic.org/docs/msn/notification/authentication.php
 #: ../libpurple/protocols/msn/error.c:244
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "ç„¡æ•ˆçš„ ticket"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "æœªçŸ¥çš„éŒ¯èª¤ä»£ç¢¼ %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN éŒ¯èª¤ï¼š%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr "å‘¼å«"
 
-#: ../libpurple/protocols/msn/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s å‘¼å«æ‚¨ï¼"
 
-#: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "å‘¼å« %s ä¸..."
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "æ‚¨çš„æ–° MSN æš±ç¨±å¤ªé•·ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "è¨å®šæ‚¨çš„æš±ç¨±ã€‚"
 
 # NOTE MSNçš„æš±ç¨±ä¸åƒYahooï¼›ä½¿ç”¨è€…å¯ä»¥è¼¸å…¥ä»»ä½•çš„æ–°æš±ç¨±ï¼Œ
 # NOTE å³ä½¿å’Œä½¿ç”¨è€…çš„å¸³è™Ÿæ¯«ç„¡é—œä¿‚ï¼Œä¼¼ä¹Žä¹Ÿæ˜¯æœ‰æ•ˆçš„
 # XXX é€™çœ‹ä¾†æ˜¯ä¸€å€‹éˆ™è¿°å¥ï¼Œäº‹å¯¦ä¸Šæ˜¯å°ä½¿ç”¨è€…ç™¼å‡ºçš„è«‹æ±‚ï¼å•é¡Œ
-#: ../libpurple/protocols/msn/msn.c:287
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "åˆ¥äººåœ¨ MSN æŸ¥é–±æ‚¨çš„å€‹äººè³‡æ–™æ™‚é¡¯ç¤ºé€™å€‹æš±ç¨±ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "è¨å®šæ‚¨çš„ä½å®¶é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "è¨å®šæ‚¨çš„è¾¦å…¬å®¤é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:339
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "è¨å®šæ‚¨çš„è¡Œå‹•é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "å…è¨± MSN å‚³å‘¼ï¼Ÿ"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/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?"
@@ -6876,329 +6934,392 @@ msgstr ""
 "æ‚¨æ˜¯å¦å…è¨±åœ¨æ‚¨å¥½å‹æ¸…å–®ä¸çš„å¥½å‹å‚³é€ Mobile Page åˆ°æ‚¨çš„è¡Œå‹•é›»è©±ï¼Œæˆ–æ˜¯å…¶ä»–çš„è¡Œå‹•"
 "è£ç½®ä¸Šå‘¢ï¼Ÿ"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "å…è¨±"
 
-#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "ä¸å…è¨±"
 
-#: ../libpurple/protocols/msn/msn.c:378
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "é€™å€‹Hotmailå¸³è™Ÿå¯èƒ½å°šæœªè¢«å•Ÿå‹•ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:404
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "é€å‡ºè¡Œå‹•è¨Šæ¯ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:406
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "å‚³å‘¼"
 
-# NOTE from #pidgin, on 20070920:
-# NOTE (20æ™‚05åˆ†52ç§’) wing: what does "Current Media" in the new msn code mean?
-# NOTE (20æ™‚07åˆ†19ç§’) rekkanoryo: wing: it's more or less "Now Playing"
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:636
-#: ../libpurple/protocols/msn/msn.c:643 ../libpurple/protocols/msn/msn.c:650
-#: ../libpurple/protocols/msn/msn.c:657 ../libpurple/protocols/msn/msn.c:663
-#: ../libpurple/protocols/msn/msn.c:669
-msgid "Current media"
-msgstr "æ£åœ¨æ’æ”¾"
-
-#: ../libpurple/protocols/msn/msn.c:648 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "é¦¬ä¸Šå›žä¾†"
 
-#: ../libpurple/protocols/msn/msn.c:655 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "å¿™ç¢Œ"
 
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "é›»è©±ä¸"
 
-#: ../libpurple/protocols/msn/msn.c:667
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "å¤–å‡ºç”¨é¤"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "æ¨‚æ‰‹åç¨±"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "å°ˆè¼¯åç¨±"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "è¨å®šæš±ç¨±..."
 
-#: ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "è¨å®šä½å®¶é›»è©±è™Ÿç¢¼..."
 
-#: ../libpurple/protocols/msn/msn.c:707
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "è¨å®šå·¥ä½œé›»è©±è™Ÿç¢¼..."
 
-#: ../libpurple/protocols/msn/msn.c:711
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "è¨å®šè¡Œå‹•é›»è©±è™Ÿç¢¼..."
 
-#: ../libpurple/protocols/msn/msn.c:717
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "é–‹å•Ÿ / é—œé–‰è¡Œå‹•è£ç½®..."
 
-#: ../libpurple/protocols/msn/msn.c:722
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "å…è¨± / ä¸å…è¨± Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "é–‹å•ŸHotmailæ”¶ä»¶åŒ£"
 
-#: ../libpurple/protocols/msn/msn.c:757
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "å‚³é€è‡³è¡Œå‹•é›»è©±"
 
-#: ../libpurple/protocols/msn/msn.c:767
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "é–‹å•ŸèŠå¤©å®¤(_C)"
 
 # XXX æš«è¯
-#: ../libpurple/protocols/msn/msn.c:805
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN éœ€è¦ SSL ç¨‹å¼åº«çš„æ”¯æ´ï¼Œè«‹å®‰è£ä¸€å€‹å—æ”¯æ´çš„ SSL ç¨‹å¼åº«ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:833
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "ç„¡æ³•é€£ç·šåˆ°ä¼ºæœå™¨ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1621 ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "å–å¾—å€‹äººè³‡è¨Šæ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: ../libpurple/protocols/msn/msn.c:1687 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "ä¸€èˆ¬"
 
-#: ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "å¹´é½¡"
 
-#: ../libpurple/protocols/msn/msn.c:1696
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "è·æ¥"
 
-#: ../libpurple/protocols/msn/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
 #: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "æ‰€åœ¨ä½ç½®"
 
-#: ../libpurple/protocols/msn/msn.c:1702 ../libpurple/protocols/msn/msn.c:1894
-#: ../libpurple/protocols/msn/msn.c:1900 ../libpurple/protocols/msn/msn.c:1907
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "å—œå¥½/èˆˆè¶£"
 
-#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msn/msn.c:1834 ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/msn/msn.c:1849 ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "è‡ªæˆ‘ç°¡ä»‹"
 
-#: ../libpurple/protocols/msn/msn.c:1725
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "ç¤¾äº¤"
 
-#: ../libpurple/protocols/msn/msn.c:1727
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "å©šå§»ç‹€æ³"
 
-#: ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "èˆˆè¶£"
 
-#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "å¯µç‰©"
 
-#: ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "æ•…é„‰"
 
-#: ../libpurple/protocols/msn/msn.c:1731
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "å±…ä½éŽçš„åœ°æ–¹"
 
-#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "æ™‚å°š"
 
-#: ../libpurple/protocols/msn/msn.c:1733
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "å¹½é»˜"
 
-#: ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "éŸ³æ¨‚"
 
 # NOTE æ—¥æ–‡poæª”åŠMSNæœ¬èº«å‡è¯ã€Œåº§å³éŠ˜ã€
-#: ../libpurple/protocols/msn/msn.c:1735 ../libpurple/protocols/msn/msn.c:1916
-#: ../libpurple/protocols/msn/msn.c:1922
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "åº§å³éŠ˜"
 
-#: ../libpurple/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "è¯çµ¡è³‡è¨Š"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "å€‹äººè³‡æ–™"
 
-#: ../libpurple/protocols/msn/msn.c:1756
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "å¦ä¸€åŠ"
 
-#: ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "ä½å®¶é›»è©±"
 
-#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "ä½å®¶é›»è©±2"
 
-#: ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "ä½å®¶åœ°å€"
 
-#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "å€‹äººè¡Œå‹•é›»è©±"
 
-#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "ä½å®¶å‚³çœŸ"
 
-#: ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "å€‹äººé›»åéƒµä»¶"
 
-#: ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "å€‹äººå³æ™‚è¨Šæ¯å¸³è™Ÿ"
 
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "é€±å¹´ç´€å¿µæ—¥"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "å·¥ä½œè³‡æ–™"
 
-#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "è·éŠœ"
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "å…¬å¸åç¨±"
 
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "æ‰€å±¬éƒ¨é–€"
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "å°ˆæ¥"
 
-#: ../libpurple/protocols/msn/msn.c:1787
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "å•†å‹™é›»è©±"
 
-#: ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "å•†å‹™é›»è©±2"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "å·¥ä½œåœ°å€"
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "å•†å‹™è¡Œå‹•é›»è©±"
 
-#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "å•†å‹™å‘¼å«å™¨"
 
-#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "å•†å‹™å‚³çœŸ"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "å•†å‹™é›»åéƒµä»¶"
 
-#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "å•†å‹™å³æ™‚è¨Šæ¯å¸³è™Ÿ"
 
-#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "é–‹å§‹æ—¥æœŸ"
 
-#: ../libpurple/protocols/msn/msn.c:1865 ../libpurple/protocols/msn/msn.c:1871
-#: ../libpurple/protocols/msn/msn.c:1878 ../libpurple/protocols/msn/msn.c:1885
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "å–œæ„›äº‹ç‰©"
 
-#: ../libpurple/protocols/msn/msn.c:1930
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "æ›´æ–°æ—¥æœŸ"
 
-#: ../libpurple/protocols/msn/msn.c:1941
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/msn/msn.c:1965
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "é€™å€‹ä½¿ç”¨è€…æœªæœ‰å»ºç«‹å…¬é–‹çš„å€‹äººè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1966
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 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 "
@@ -7207,14 +7328,16 @@ msgstr ""
 "MSN å›žå ±èªªæ‰¾ä¸åˆ°é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚é€™è¡¨ç¤ºé€™å€‹ä½¿ç”¨è€…å¯èƒ½ä¸å˜åœ¨ï¼›äº¦æœ‰å¯èƒ½ä½¿"
 "ç”¨è€…å˜åœ¨ï¼Œä½†æ²’æœ‰å»ºç«‹å…¬é–‹çš„å€‹äººè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1970
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "åœ¨é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ç¶²é æ‰¾ä¸åˆ°ä»»ä½•å¯ç”¨çš„è³‡æ–™ã€‚é€™å€‹ä½¿ç”¨è€…æ¥µæœ‰å¯èƒ½ä¸¦ä¸å˜åœ¨ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1978
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "å€‹äººè³‡æ–™ç¶²å€"
@@ -7229,49 +7352,65 @@ msgstr "å€‹äººè³‡æ–™ç¶²å€"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2267
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger å”å®šæ¨¡çµ„"
 
-#: ../libpurple/protocols/msn/msn.c:2302
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "ä½¿ç”¨ HTTP æ–¹å¼"
 
 # XXX è¯æ–‡æœ‰å¾…æ”¹é€² - acli 20070918
-#: ../libpurple/protocols/msn/msn.c:2307
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
 msgstr "HTTP æ–¹å¼å°ˆç”¨ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/msn/msn.c:2312
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "é¡¯ç¤ºä½¿ç”¨è€…åœ–ç¤º"
 
-#: ../libpurple/protocols/msn/msn.c:2320
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudgeï¼šå‘¼å«ä½¿ç”¨è€…ï¼Œå¼•èµ·ä»–å€‘çš„æ³¨æ„"
 
-#: ../libpurple/protocols/msn/nexus.c:137
+#: ../libpurple/protocols/msn/nexus.c:70
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID èªè‰ï¼šç„¡æ³•é€£ç·š"
 
-#: ../libpurple/protocols/msn/nexus.c:272
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr "Windows Live ID èªè‰ï¼šåœ¨ä¼ºæœå™¨å‚³ä¾†çš„å›žæ‡‰ç„¡æ³•æ‰¾åˆ°èªè‰ç¬¦è¨˜"
+
+#: ../libpurple/protocols/msn/nexus.c:172
 msgid "Windows Live ID authentication Failed"
 msgstr "Windows Live ID èªè‰å¤±æ•—"
 
 #: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ç¾¤çµ„ã€‚"
 
 #: ../libpurple/protocols/msn/notification.c:191
 #: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:371
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "æœªçŸ¥éŒ¯èª¤ã€‚"
 
 # NOTE: ç¬¬äºŒå€‹ %s ç‚ºä½¿ç”¨è€…åç¨±ï¼Œç¬¬ä¸‰å€‹ %s ç‚ºé€šè¨Šå”å®šåç¨±
 # NOTE: ç¬¬ä¸€å€‹ %s ä¼¼ä¹Žä¿‚éŒ¯èª¤è¨Šæ¯æ‘˜è¦ï¼ˆæ•´å€‹å—ä¸²ç‚ºè¦–çª—æ¨™é¡Œï¼‰
 #: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s)ï¼š%1$s"
@@ -7287,34 +7426,39 @@ msgstr "ä¸æ˜ŽéŒ¯èª¤ï¼ˆä»£ç¢¼ %dï¼‰"
 msgstr "ä¸æ˜ŽéŒ¯èª¤ï¼ˆä»£ç¢¼ %dï¼‰"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4425
+#: ../libpurple/protocols/sametime/sametime.c:4471
 msgid "Unable to add user"
 msgstr "ç„¡æ³•æ–°å¢žä½¿ç”¨è€…"
 
 #  TODO è«‹è¦†æŸ¥ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
 #: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) æ–°å¢žä½¿ç”¨è€…å¤±æ•—"
 
 #  TODO è«‹è¦†æŸ¥ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
 #: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) æ‹’çµ•ä½¿ç”¨è€…å¤±æ•—"
 
 #  TODO è«‹è¦†æŸ¥ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
 #: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) å…è¨±ä½¿ç”¨è€…å¤±æ•—"
 
 #: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "å› ç‚ºå¥½å‹æ¸…å–®å·²æ»¿ï¼Œä»¥è‡´ç„¡æ³•æ–°å¢ž %s"
 
 #: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ Passport å¸³è™Ÿ"
@@ -7322,20 +7466,24 @@ msgstr "%s ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„ Passpor
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å˜åœ¨ã€é€šé †
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
 #: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "æš«æ™‚ç„¡æ³•æä¾›æœå‹™"
 
 #: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "ç„¡æ³•æ›´æ”¹ç¾¤çµ„åç¨±"
 
 #: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "ç„¡æ³•ç§»é™¤ç¾¤çµ„"
 
 # NOTE "in %d minutes" æ„ç‚ºã€Œåœ¨ %d åˆ†é˜ä¹‹å…§ã€çš„æ„æ€
 # NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1934
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7362,11 +7510,9 @@ msgstr[1] ""
 "\n"
 "ç•¶ç¶è·å·¥ä½œçµæŸï¼Œæ‚¨å°‡å¯ä»¥å†åº¦ç™»å…¥ã€‚"
 
-#: ../libpurple/protocols/msn/oim.c:142
-msgid "Unable to connect to OIM server"
-msgstr "ç„¡æ³•é€£ç·šåˆ° OIM ä¼ºæœå™¨ã€‚"
-
 #: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
 #: ../libpurple/protocols/qq/qq_proxy.c:242
 #: ../libpurple/protocols/qq/qq_proxy.c:324
 #: ../libpurple/protocols/qq/qq_proxy.c:369
@@ -7386,16 +7532,19 @@ msgstr "ç„¡æ³•é€£ç·š"
 msgstr "ç„¡æ³•é€£ç·š"
 
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "å¯«å…¥éŒ¯èª¤"
 
 # NOTE OSCAR éŒ¯èª¤è¨Šæ¯æ‡‰å¯åƒé–± http://aimdoc.sourceforge.net/OSCARdoc/ï¼Œä½†åœ¨è©²ç«™å¾ˆé›£æ‰¾æ±è¥¿
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "è®€å–éŒ¯èª¤"
 
 #  NOTE é¦–å€‹ %s ç‚ºã€ŒNotificationã€æˆ–ã€ŒSwitchboardã€å…¶ä¸€ï¼Œæ¬¡ç‚ºä¼ºæœå™¨åç¨±ï¼Œæœ«è€…ç‚ºéŒ¯èª¤è¨Šæ¯
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7404,94 +7553,116 @@ msgstr ""
 "%s ä¼ºæœå™¨å‚³ä¾†ä¸€å€‹é€£ç·šéŒ¯èª¤ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:338
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "é€™å€‹ä¼ºæœå™¨ä¸æ”¯æ´æˆ‘å€‘ä½¿ç”¨çš„é€šè¨Šå”å®šã€‚"
 
-#: ../libpurple/protocols/msn/session.c:342
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "è§£æž HTTP é€”ä¸ç™¼ç”ŸéŒ¯èª¤ã€‚"
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
 #: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "æ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
 
 #  XXX
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨ MSN ä½¿æœå™¨ï¼Œè«‹éŽä¸€æœƒå¾Œé‡è©¦ã€‚"
 
-#: ../libpurple/protocols/msn/session.c:356
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN ä¼ºæœå™¨å°‡æš«æ™‚é—œé–‰ã€‚"
 
-#: ../libpurple/protocols/msn/session.c:361
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "ç„¡æ³•èªè‰ï¼š%s"
 
-#: ../libpurple/protocols/msn/session.c:366
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "æš«æ™‚ç„¡æ³•å–å¾—æ‚¨çš„å¥½å‹æ¸…å–®ï¼Œè«‹éŽä¸€æœƒå¾Œé‡è©¦ã€‚"
 
 # See cnscode.org.tw
-#: ../libpurple/protocols/msn/session.c:387
-#: ../libpurple/protocols/msn/session.c:389
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "äº¤æ¡ä¸"
 
-#: ../libpurple/protocols/msn/session.c:390
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "èªè‰é–‹å§‹ä¸"
 
-#: ../libpurple/protocols/msn/session.c:391
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "å–å¾— Cookie ä¸"
 
-#: ../libpurple/protocols/msn/session.c:393
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "å‚³é€ Cookie ä¸"
 
-#: ../libpurple/protocols/msn/session.c:394
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "è®€å–å¥½å‹æ¸…å–®ä¸"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "ä¸åœ¨é›»è…¦å‰"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "é›»è©±ä¸"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "å¤–å‡ºç”¨é¤"
 
 #: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "é€å‡ºè¨Šæ¯é€¾æ™‚ï¼Œå¯èƒ½æ²’æœ‰é€å‡ºè¨Šæ¯ï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "éš±èº«æ™‚ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "å› ç‚ºä½¿ç”¨è€…ç›®å‰é›¢ç·šï¼Œæ‰€ä»¥ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "å› ç‚ºé€£ç·šç™¼ç”ŸéŒ¯èª¤ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "å› ç‚ºæˆ‘å€‘å‚³é€è¨Šæ¯çš„é€Ÿåº¦å¤ªå¿«ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/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:"
@@ -7500,20 +7671,24 @@ msgstr ""
 "å¹¾åˆ†é˜å¾Œé‡è©¦ï¼‰ï¼š"
 
 #: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "å› ç‚º Switchboard ç™¼ç”ŸéŒ¯èª¤ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡º"
 
 #: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "å› ç‚ºç™¼ç”Ÿä¸æ˜Žçš„éŒ¯èª¤ï¼Œè¨Šæ¯å¯èƒ½æ²’æœ‰é€å‡ºï¼š"
 
 #: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s å°‡æ‚¨åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ã€‚"
 
 #: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s å°‡æ‚¨å¾žä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ä¸ç§»é™¤ã€‚"
@@ -7522,14 +7697,35 @@ msgstr "%s å°‡æ‚¨å¾žä»–ï¼ˆå¥¹ï¼‰çš„å¥½å
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "ç„¡æ³•æ–°å¢žã€Œ%sã€ã€‚"
 
 #: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "æ‚¨æ‰€è¼¸å…¥çš„å¸³è™Ÿç„¡æ•ˆã€‚"
 
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "MSN å”å®šæ¨¡çµ„"
+
 # XXX æš«è¯ - 20061025/20070912
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
@@ -7557,52 +7753,52 @@ msgstr "MySpace æ•ä¸æ”¯æ´é•·æ–¼ %d å€
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1810
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM éŒ¯èª¤"
 
 # NOTE OSCAR éŒ¯èª¤è¨Šæ¯æ‡‰å¯åƒé–± http://aimdoc.sourceforge.net/OSCARdoc/ï¼Œä½†åœ¨è©²ç«™å¾ˆé›£æ‰¾æ±è¥¿
-#: ../libpurple/protocols/myspace/myspace.c:350
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "è®€å–é©—è‰æŒ‘æˆ°ä¸"
 
 # XXX å¥½åƒæœ‰äº›æ€ªï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/myspace/myspace.c:356
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "ä¼ºæœå™¨é€ä¾†çš„é©—è‰æŒ‘æˆ°æœ‰æ„æ–™ä¹‹å¤–çš„é•·åº¦"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "ç™»å…¥ä¸"
 
-#: ../libpurple/protocols/myspace/myspace.c:1293
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "èˆ‡ä¼ºæœå™¨å¤±åŽ»é€£ç·šï¼ˆ%d ç§’å…§æ”¶ä¸åˆ°ä»»ä½•è³‡æ–™ï¼‰"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1335
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr "æœ‰æ–°éƒµä»¶"
 
-#: ../libpurple/protocols/myspace/myspace.c:1336
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr "ç¶²èªŒæœ‰æ–°ç•™è¨€"
 
-#: ../libpurple/protocols/myspace/myspace.c:1337
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr "å€‹äººè³‡æ–™ç¶²é æœ‰æ–°ç•™è¨€"
 
 #  FIXME è¯æ–‡å¾ˆä¸é€šé † - acli 20070913
-#: ../libpurple/protocols/myspace/myspace.c:1338
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr "æœ‰æ–°çš„äº¤å‹è¦æ±‚ï¼"
 
-#: ../libpurple/protocols/myspace/myspace.c:1339
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr "ç›¸ç‰‡é›†æœ‰æ–°ç•™è¨€"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr "MySpace"
 
@@ -7610,17 +7806,17 @@ msgstr "MySpace"
 #. 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:1550
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "å·²é€£çµ"
 
-#: ../libpurple/protocols/myspace/myspace.c:1561
-#: ../libpurple/protocols/myspace/myspace.c:1563
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 msgid "No username set"
 msgstr "æœªæœ‰è¨å®šä½¿ç”¨è€…åç¨±"
 
-#: ../libpurple/protocols/myspace/myspace.c:1562
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7628,134 +7824,133 @@ msgstr ""
 "è«‹åˆ° http://editprofile.myspace.com/index.cfm?fuseaction=profile.username é¸"
 "æ“‡ä¸€å€‹ä½¿ç”¨è€…åç¨±å¾Œï¼Œå†å˜—è©¦é‡æ–°ç™»å…¥ã€‚"
 
-#: ../libpurple/protocols/myspace/myspace.c:1789
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "é€šè¨Šå”å®šéŒ¯èª¤ï¼Œä»£ç¢¼ %dï¼š%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1981
-#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
 msgstr "ç„¡æ³•æ–°å¢žå¥½å‹"
 
-#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr "ã€Œaddbuddyã€æŒ‡ä»¤å¤±æ•—ã€‚"
 
-#: ../libpurple/protocols/myspace/myspace.c:2015
-#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
 msgstr "ã€Œpersistã€æŒ‡ä»¤å¤±æ•—"
 
-#: ../libpurple/protocols/myspace/myspace.c:2120
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr "ç„¡æ¤ä½¿ç”¨è€…ï¼š%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2121
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr "æœå°‹ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
-#: ../libpurple/protocols/myspace/myspace.c:2252
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr "ç„¡æ³•ç§»é™¤ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr "ã€Œdelbuddyã€æŒ‡ä»¤å¤±æ•—"
 
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr "ã€Œblocklistã€æŒ‡ä»¤å¤±æ•—"
 
 #  NOTEã€Œconditionã€å¯èƒ½ç‚ºã€Œæ¢ä»¶ã€æˆ–ã€Œç‹€æ³ã€
 #  NOTE åŽŸå§‹ç¢¼å…§é€™å—ä¸²æ˜¯æŒ‡ã€Œcond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITEã€
 #  NOTE æ‰€ä»¥æ‡‰æ˜¯ã€Œç‹€æ³ã€è€Œéžã€Œæ¢ä»¶ã€
-#: ../libpurple/protocols/myspace/myspace.c:2320
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr "è¼¸å…¥ç‹€æ³ç„¡æ•ˆ"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2369
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
 msgstr "è®€å–ç”¨çš„æš«å˜å€æ»¿äº†"
 
-#: ../libpurple/protocols/myspace/myspace.c:2407
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "ç„¡æ³•è§£æžè¨Šæ¯"
 
-#: ../libpurple/protocols/myspace/myspace.c:2476
+#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "ç„¡æ³•é€£åˆ°ä¼ºæœå™¨ï¼š%s (%d)"
 
 #  NOTE é€™æ˜¯ç¾¤çµ„åç¨±
-#: ../libpurple/protocols/myspace/myspace.c:2647
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr "å³æ™‚è¨Šæ¯çš„å¥½å‹"
 
-#: ../libpurple/protocols/myspace/myspace.c:2747
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr "å¾žä¼ºæœå™¨æ–°å¢žæˆ–æ›´æ–°äº† %d å€‹å¥½å‹ï¼ˆåŒ…æ‹¬å·²åœ¨å¥½å‹æ¸…å–®ä¸Šçš„å¥½å‹ï¼‰"
 
-#: ../libpurple/protocols/myspace/myspace.c:2748
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr "å¾žä¼ºæœå™¨åŠ å…¥è¯çµ¡äºº"
 
-#: ../libpurple/protocols/myspace/myspace.c:2800
-#: ../libpurple/protocols/myspace/myspace.c:2865
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr "å¾ž MySpace.com æ–°å¢žå¥½å‹"
 
-#: ../libpurple/protocols/myspace/myspace.c:2801
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr "åŒ¯å…¥å¥½å‹å¤±æ•—"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2857
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "å°‹æ‰¾å¥½å‹..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2860
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr "è®Šæ›´å³æ™‚é€šè¨Šåç¨±..."
 
 #  NOTE é€™ä¼¼ä¹Žæ˜¯è¦–çª—æ¨™é¡Œ
-#: ../libpurple/protocols/myspace/myspace.c:3162
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr "myim ç¶²å€è™•ç†å™¨"
 
-#: ../libpurple/protocols/myspace/myspace.c:3163
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "ç„¡æ³•æ‰¾å¯ä»¥é–‹å•Ÿé€™å€‹ myim ç¶²å€çš„ MySpaceIM å¸³è™Ÿã€‚"
 
-#: ../libpurple/protocols/myspace/myspace.c:3164
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "è«‹å•Ÿç”¨åˆé©çš„ MySpaceIM å¸³è™Ÿå¾Œå†é‡è©¦ã€‚"
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr "åœ¨ç‹€æ…‹åˆ—é¡¯ç¤ºæš±ç¨±"
 
-#: ../libpurple/protocols/myspace/myspace.c:3290
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr "åœ¨ç‹€æ…‹åˆ—é¡¯ç¤ºæ¨™é¡Œ"
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr "å‚³é€è¡¨æƒ…åœ–ç¤º"
 
-#: ../libpurple/protocols/myspace/myspace.c:3300
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr "ç†’å¹•è§£åƒåº¦ï¼ˆDPIï¼‰"
 
-#: ../libpurple/protocols/myspace/myspace.c:3303
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr "åŸºç¤Žå—é«”å¤§å°(é»ž)"
 
@@ -7766,7 +7961,7 @@ msgstr "ä½¿ç”¨è€…"
 msgstr "ä½¿ç”¨è€…"
 
 #: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2979
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "å€‹äººè³‡æ–™"
 
@@ -8094,110 +8289,110 @@ msgstr "ç™»å…¥å¤±æ•— (%s)ã€‚"
 msgstr "ç™»å…¥å¤±æ•— (%s)ã€‚"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ã€‚ç„¡æ³•å–å¾—ä½¿ç”¨è€…çš„ç´°ç¯€ (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:398
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "ç„¡æ³•æŠŠ %s åŠ è‡³æ‚¨çš„å¥½å‹æ¸…å–® (%s)ã€‚"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:424
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "ç„¡æ³•é‚€è«‹ä½¿ç”¨è€… (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:534
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯è‡³ %sã€‚ç„¡æ³•å»ºç«‹æœƒè° (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:539
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ã€‚ç„¡æ³•å»ºç«‹æœƒè° (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:586
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "ç„¡æ³•åœ¨ä¼ºæœå™¨ä¸Šçš„æ¸…å–®æŠŠä½¿ç”¨è€… %s ç§»è‡³ç›®éŒ„ %sã€‚å»ºç«‹ç›®éŒ„æ™‚ç™¼ç”ŸéŒ¯èª¤ (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "ç„¡æ³•æ–°å¢ž %s è‡³å¥½å‹æ¸…å–®ã€‚åœ¨ä¼ºæœå™¨ä¸Šçš„æ¸…å–®å»ºç«‹ç›®éŒ„æ™‚ç™¼ç”ŸéŒ¯èª¤ (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:707
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "ç„¡æ³•å–å¾—ä½¿ç”¨è€… %s çš„ç´°ç¯€ (%s)ã€‚"
 
 #  FIXME è¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "ç„¡æ³•æŠŠä½¿ç”¨è€…åŠ è‡³æ‚¨çš„éš±ç§æ¸…å–® (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:800
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "ç„¡æ³•æŠŠ %s åŠ è‡³æ‚¨çš„æ‹’çµ•æ¸…å–® (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:853
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "ç„¡æ³•æŠŠ %s åŠ è‡³æ‚¨çš„å…è¨±æ¸…å–® (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:921
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "ç„¡æ³•æŠŠ %s ç§»é™¤è‡ªæ‚¨çš„éš±ç§æ¸…å–® (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "ç„¡æ³•åœ¨ä¼ºæœå™¨ç«¯ä¿®æ”¹éš±ç§è¨å®š (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1014
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "ç„¡æ³•å»ºç«‹æœƒè° (%s)ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "å’Œä¼ºæœå™¨é–“çš„é€šè¨Šç™¼ç”ŸéŒ¯èª¤ã€‚é—œé–‰é€£ç·šã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "é›»è©±è™Ÿç¢¼"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "å€‹äººè·éŠœ"
 
 #  NOTE ä¼¼ä¹Žç„¡ä¸æ–‡è¯æ–‡
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1504
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ä½¿ç”¨è€…ID"
 
@@ -8207,43 +8402,39 @@ msgstr "ä½¿ç”¨è€…ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "å…¨å"
 
 #  NOTEã€ŒGroupWiseã€æ˜¯è»Ÿä»¶åç¨±ï¼Œæ£å¼ä¸æ–‡åå¤§æ¦‚ä¸æœƒæ˜¯ã€Œç¾¤çµ„ã€...
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise æœƒè° %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
-msgid "Unable to make SSL connection to server."
-msgstr "ç„¡æ³•ä½¿ç”¨ SSL å”å®šé€£ç·šåˆ°ä¼ºæœå™¨ã€‚"
-
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "èªè‰ä¸..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "ç„¡æ³•é€£ç·šåˆ°ä¼ºæœå™¨ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "ç‰å¾…å›žè¦†ä¸..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "é‚€è«‹äº† %s åŠ å…¥é€™å€‹äº¤è«‡ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "é‚€è«‹åŠ å…¥äº¤è«‡"
 
 #  NOTEã€ŒSentã€ä¿‚æŒ‡ç™¼å‡ºé‚€è«‹æ™‚çš„æ™‚é–“
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8254,36 +8445,32 @@ msgstr ""
 "\n"
 "æ™‚é–“ï¼š%s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "æ‚¨è¦åŠ å…¥å€‹é€™äº¤è«‡å—Žï¼Ÿ"
 
 # XXX æš«è¯
-#: ../libpurple/protocols/novell/novell.c:2017
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "æ‚¨å·²ç¶“è¢«ç™»å‡ºï¼Œå› ç‚ºæ‚¨å·²åœ¨å…¶ä»–é›»è…¦ä¸Šç™»å…¥ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ç›®å‰ä¼¼ä¹Žé›¢ç·šï¼Œæ‰€ä»¥ä¸æœƒæ”¶åˆ°æ‚¨å‰›æ‰é€å‡ºçš„è¨Šæ¯ã€‚"
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "ç„¡æ³•é€£ç·šè‡³ä¼ºæœå™¨ã€‚è«‹è¼¸å…¥æ‚¨å¸Œæœ›é€£ç·šè‡³çš„ä¼ºæœå™¨çš„ä½å€ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2200
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "éŒ¯èª¤ï¼šæ²’æœ‰å®‰è£ SSL æ”¯æ´ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2509
+#: ../libpurple/protocols/novell/novell.c:2521
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "é€™å€‹æœƒè°å·²ç¶“é—œé–‰ã€‚ç„¡æ³•ç¹¼çºŒé€å‡ºä»»ä½•è¨Šæ¯ã€‚"
 
@@ -8297,31 +8484,31 @@ msgstr "é€™å€‹æœƒè°å·²ç¶“é—œé–‰ã€‚ç„¡æ³
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger å”å®šæ¨¡çµ„"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "ä¼ºæœå™¨ä½å€"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "ä¼ºæœå™¨é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2471
-#: ../libpurple/protocols/yahoo/yahoo.c:2638
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
 #: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
 #: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "ä¼ºæœå™¨é—œé–‰é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
 #: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
@@ -8332,7 +8519,7 @@ msgstr ""
 "èˆ‡ä¼ºæœå™¨ä¹‹é–“çš„é€£ç·šçªç„¶ä¸æ–·:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:396
 #: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
 #: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
 #: ../libpurple/proxy.c:1491
@@ -8370,7 +8557,7 @@ msgstr "ICQ å”å®šæ¨¡çµ„"
 msgstr "ICQ å”å®šæ¨¡çµ„"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "ç·¨ç¢¼"
@@ -8536,8 +8723,8 @@ msgstr ""
 "ç”¨æœ‰å•é¡Œçš„ç”¨æˆ¶ç«¯ç¨‹å¼ã€‚ï¼‰"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
-#: ../pidgin/gtkutils.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "å¥½å‹åœ–ç¤º"
@@ -8552,15 +8739,15 @@ msgstr "AIM å¼å³æ™‚è¨Šæ¯"
 msgstr "AIM å¼å³æ™‚è¨Šæ¯"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "èŠå¤©"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6064
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "æŽ¥æ”¶æª”æ¡ˆ"
 
@@ -8645,17 +8832,17 @@ msgstr "ç…§ç›¸æ©Ÿ"
 msgstr "ç…§ç›¸æ©Ÿ"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5830
 msgid "Free For Chat"
 msgstr "æˆ‘æœ‰ç©ºèŠå¤©"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:5865
 msgid "Not Available"
 msgstr "é•·æ™‚é–“é›¢é–‹"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5855
+#: ../libpurple/protocols/oscar/oscar.c:5851
 msgid "Occupied"
 msgstr "å¿™ç¢Œ"
 
@@ -8664,9 +8851,9 @@ msgstr "å…è¨±å…¶ä»–ä½¿ç”¨è€…åœ¨ç¶²è·¯ä¸
 msgid "Web Aware"
 msgstr "å…è¨±å…¶ä»–ä½¿ç”¨è€…åœ¨ç¶²è·¯ä¸ŠæŸ¥çœ‹æ‚¨ç›®å‰çš„ç‹€æ…‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "éš±èº«"
@@ -8676,13 +8863,13 @@ msgstr "ä¸Šç·š"
 msgstr "ä¸Šç·š"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3722
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1128
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP ä½å€"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "è¦å‘Šç‰ç´š"
 
@@ -8731,31 +8918,35 @@ msgstr ""
 "ç„¡æ³•ç™»å…¥ï¼šç„¡æ³•ä»¥ %s èº«ä»½ç™»å…¥ï¼Œå› ç‚ºé€™å€‹å¸³è™Ÿæ˜¯ç„¡æ•ˆçš„ã€‚å¸³è™Ÿå¿…é ˆç‚ºæœ‰æ•ˆé›»éƒµåœ°å€ï¼›"
 "æˆ–è€…ä»¥è‹±æ–‡å—æ¯èµ·å§‹ï¼Œä¸¦åªå«è‹±æ–‡å—æ¯ã€æ•¸å—åŠç©ºç™½ï¼›æˆ–è€…åªç”±æ•¸å—çµ„æˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "å¸³è™Ÿç„¡æ•ˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1048
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "éŒ¯èª¤çš„å¯†ç¢¼ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "æ‚¨çš„å¸³è™Ÿç›®å‰åœç”¨ä¸ã€‚"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å˜åœ¨ã€é€šé †
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨ AOL å³æ™‚è¨Šæ¯æœå‹™ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 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."
@@ -8763,44 +8954,53 @@ msgstr ""
 "æ‚¨çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœæ‚¨ä¾ç„¶ç¹¼çºŒå˜—è©¦è‘—é€£"
 "ç·šï¼Œé‚£éº¼æ‚¨çš„ç‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "æ‚¨æ‰€ä½¿ç”¨çš„ç”¨æˆ¶ç«¯ç¨‹å¼å¤ªéŽè€èˆŠã€‚è«‹åˆ° %s æ›´æ–°"
 
-#: ../libpurple/protocols/oscar/oscar.c:1413
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "ç„¡æ³•é€£ç·š"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "æ”¶åˆ°èªè‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "æ‚¨æ‰€è¼¸å…¥çš„ SecurID ç¢¼ç„¡æ•ˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "è«‹è¼¸å…¥ SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:1448
 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.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1455
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:5939
-#: ../libpurple/protocols/oscar/oscar.c:6220 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "ç¢ºå®š(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8809,53 +9009,53 @@ msgstr ""
 "æ‚¨å¯èƒ½æœƒçŸæ™‚é–“ä¸æ–·é€£ç·šã€‚æ‚¨å¯èƒ½æœƒæƒ³åœ¨é€™å€‹å•é¡Œè¢«ä¿®æ£å¾Œä½¿ç”¨ TOCã€‚è«‹åˆ° %s çœ‹çœ‹æœ‰"
 "æ²’æœ‰æ›´æ–°ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:1540
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "ç„¡æ³•å–å¾—æœ‰æ•ˆçš„ AIM ç™»å…¥ç¢¼ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "æ‚¨å¯èƒ½æœƒçŸæ™‚é–“ä¸æ–·é€£ç·šã€‚è«‹åˆ° %s çœ‹çœ‹æœ‰æ²’æœ‰æ›´æ–°ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1628
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "ç„¡æ³•å–å¾—æœ‰æ•ˆçš„ç™»å…¥ç¢¼ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "å¯†ç¢¼é€å‡º"
 
-#: ../libpurple/protocols/oscar/oscar.c:1714
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "ç„¡æ³•åˆå§‹åŒ–é€£çµ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2205
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "è«‹é€šéŽæˆ‘çš„èªè‰è¦æ±‚ï¼Œå¥½è®“æˆ‘å¯ä»¥å°‡æ‚¨åŠ å…¥æˆ‘çš„å¥½å‹æ¸…å–®ä¸ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2245
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "èªè‰è¦æ±‚è¨Šæ¯ï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "è«‹é€šéŽæˆ‘çš„èªè‰ï¼"
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:2422
-#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "æ²’æœ‰çµ¦äºˆåŽŸå› ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "æ‹’çµ•èªè‰è¨Šæ¯ï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8865,17 +9065,17 @@ msgstr ""
 "ä½¿ç”¨è€… %u å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†æ‚¨å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ èªè‰æ‹’çµ•ã€‚"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "ä½¿ç”¨è€… %u åŒæ„äº†æ‚¨å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2438
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8888,7 +9088,7 @@ msgstr ""
 "ä¾†è‡ªï¼š%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2446
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8901,7 +9101,7 @@ msgstr ""
 "ä¾†è‡ªï¼š%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2454
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8914,38 +9114,38 @@ msgstr ""
 "è¨Šæ¯ç‚ºï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ä½¿ç”¨è€… %u é€ä¾†ä¸€å€‹å¥½å‹è³‡è¨Šï¼š%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "æ‚¨æƒ³å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥åˆ°æ‚¨çš„å¥½å‹åå–®ä¸å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "å©‰æ‹’(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒæ˜¯ç„¡æ•ˆçš„ã€‚"
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2620
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå¤ªå¤§äº†ã€‚"
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘å¤ªå¤§äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2629
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8955,21 +9155,21 @@ msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘å‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 
 # XXX è·ŸèŠ¬è˜æ–‡çš„å‰è¯è€… (Arto) æœ‰åŒæ„Ÿï¼Œç›´è¯ã€Œé‚ªæƒ¡ã€å¥½åƒè¡Œä¸é€šï¼Œä¸‹åŒ
-#: ../libpurple/protocols/oscar/oscar.c:2638
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2647
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºæ‚¨å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºæ‚¨å¤ªé‚ªæƒ¡äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -8977,55 +9177,55 @@ msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€
 msgstr[1] "æ‚¨éºå¤±äº† %hu å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š%s"
 
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2816
-#: ../libpurple/protocols/oscar/oscar.c:2880
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "åŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2814
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯è‡³ %sï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:2880
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "ç„¡æ³•å–å¾—å€‹äººè³‡è¨Šï¼š%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "ä¸Šç·šè‡ª"
 
 # XXX æ”¹è¯ã€Œè¨»å†Šæ—¥æœŸã€æœƒå¦æ¯”è¼ƒé€šé †ï¼Ÿ
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "æˆç‚ºæˆå“¡çš„æ™‚é–“"
 
-#: ../libpurple/protocols/oscar/oscar.c:2951
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "å°šæœ‰è¨Šæ¯"
 
-#: ../libpurple/protocols/oscar/oscar.c:3059
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "æ‚¨çš„ AIM å¯èƒ½æ–·ç·šäº†ã€‚"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3247
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "ã€Œç„¡æ³•é¡¯ç¤ºä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒåŒ…å«äº†ç„¡æ•ˆå—å…ƒã€‚ã€"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9033,110 +9233,110 @@ msgstr ""
 "æ‚¨æœ€è¿‘åšçš„ä¸€å€‹å‹•ä½œç„¡æ³•å®Œæˆï¼Œå› ç‚ºæ‚¨å·²ç¶“é”åˆ°ç™¼é€è¨Šæ¯é€ŸçŽ‡çš„ä¸Šé™ã€‚è«‹ç‰å¾…åç§’å¾Œå†"
 "è©¦ä¸€æ¬¡ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3494
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "æ‚¨å·²ç¶“ç”±èŠå¤©å®¤ %s åœæ¢é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3744
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "è¡Œå‹•é›»è©±"
 
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "å€‹äººç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "å…¶ä»–è³‡è¨Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "éƒµéžå€è™Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "éƒ¨é–€"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "è·ä½"
 
-#: ../libpurple/protocols/oscar/oscar.c:3833
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "å·¥ä½œè³‡è¨Š"
 
 # XXX é€™æ˜¯ä»€éº¼ (æƒ…å½¢ä¸‹å‡ºç¾çš„)ï¼Ÿ (å¥½åƒæ˜¯ä»¥å‰è¯ã€Œè¨Šæ¯ã€çš„é‚£å€‹??)
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "å½ˆå‡ºè¨Šæ¯"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3932
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "ä¸‹åˆ—æ˜¯ %s çš„å¸³è™Ÿ"
 msgstr[1] "ä¸‹åˆ—æ˜¯ %s çš„å¸³è™Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "å¸³è™Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3963
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "æ‰¾ä¸åˆ°å’Œé›»åéƒµä»¶åœ°å€ %s ç›¸é—œçš„çµæžœ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "æ‚¨æ‡‰è©²æœƒæ”¶åˆ°ä¸€å°è¦æ±‚å° %s é€²è¡Œèªè‰çš„é›»åéƒµä»¶ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "å¸³è™Ÿç¢ºèª"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "æ›´æ”¹å¸³è™Ÿè³‡è¨ŠéŒ¯èª¤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, 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:4023
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "éŒ¯èª¤ 0x%04xï¼šç„¡æ³•æ ¼å¼åŒ–å¸³è™Ÿï¼Œå› ç‚ºå®ƒæ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, 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:4029
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, 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:4032
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9144,37 +9344,37 @@ msgstr ""
 msgstr ""
 "éŒ¯èª¤ 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»åéƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹é›»åéƒµä»¶åœ°å€å’Œå¤ªå¤šçš„å¸³è™Ÿç”¢ç”Ÿé—œé€£ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, 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:4038
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "éŒ¯èª¤ 0x%04xï¼šæœªçŸ¥éŒ¯èª¤ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s çš„é›»åéƒµä»¶åœ°å€ç‚º %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4050
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "å¸³è™Ÿè³‡è¨Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:4233
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "ç„¡æ³•å‚³é€å³æ™‚è¨Šæ¯å½±åƒï¼›è¦å‚³é€å³æ™‚è¨Šæ¯å½±åƒï¼Œå¿…é ˆèˆ‡å°æ–¹ç›´æŽ¥é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "ç„¡æ³•è¨å®š AIM å€‹äººè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4500
 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 "
@@ -9183,7 +9383,7 @@ msgstr ""
 "æ‚¨åœ¨æœªç™»å…¥å®Œæˆå‰è¦æ±‚ä¿®æ”¹æ‚¨çš„å€‹äººè³‡è¨Šï¼Œæ‰€ä»¥é€™äº›è³‡è¨Šä¸¦æœªè¢«ä¿®æ”¹ã€‚è«‹åœ¨å®Œæˆç™»å…¥å¾Œ"
 "å†é‡æ–°é€²è¡Œè¨å®šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9194,11 +9394,11 @@ msgstr[1] "å€‹äººè³‡è¨Šçš„é•·åº¦è¶…å‡ºäº
 msgstr[0] "å€‹äººè³‡è¨Šçš„é•·åº¦è¶…å‡ºäº† %d å€‹ä½å…ƒçµ„çš„ä¸Šé™ï¼ŒéŽé•·éƒ¨åˆ†å·²è¢«æˆªåŽ»ã€‚"
 msgstr[1] "å€‹äººè³‡è¨Šçš„é•·åº¦è¶…å‡ºäº† %d å€‹ä½å…ƒçµ„çš„ä¸Šé™ï¼ŒéŽé•·éƒ¨åˆ†å·²è¢«æˆªåŽ»ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4524
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "å€‹äººè³‡è¨ŠéŽé•·ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9209,11 +9409,11 @@ msgstr[1] "é›¢é–‹è¨Šæ¯çš„é•·åº¦è¶…å‡ºäº
 msgstr[0] "é›¢é–‹è¨Šæ¯çš„é•·åº¦è¶…å‡ºäº† %d å€‹ä½å…ƒçµ„çš„ä¸Šé™ï¼ŒéŽé•·éƒ¨åˆ†å·²è¢«æˆªåŽ»ã€‚"
 msgstr[1] "é›¢é–‹è¨Šæ¯çš„é•·åº¦è¶…å‡ºäº† %d å€‹ä½å…ƒçµ„çš„ä¸Šé™ï¼ŒéŽé•·éƒ¨åˆ†å·²è¢«æˆªåŽ»ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4574
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "é›¢é–‹è¨Šæ¯éŽé•·ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4647
+#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9224,33 +9424,33 @@ msgstr ""
 "æ•ˆé›»éƒµåœ°å€ï¼›æˆ–è€…å¿…é ˆä»¥è‹±æ–‡å—æ¯ç‚ºé–‹é ï¼ŒåŒæ™‚ç”±ã€Œè‹±æ–‡å—æ¯ã€ã€ã€Œæ•¸å—ã€å’Œã€Œç©ºç™½ã€"
 "æ‰€çµ„æˆï¼Œæˆ–è€…å–®ç´”ä»¥ã€Œæ•¸å—ã€çµ„æˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4649
-#: ../libpurple/protocols/oscar/oscar.c:5101
-#: ../libpurple/protocols/oscar/oscar.c:5116
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "ç„¡æ³•åŠ å…¥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4768
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "ç„¡æ³•è®€å–å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/oscar/oscar.c:4769
+#: ../libpurple/protocols/oscar/oscar.c:4764
 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."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "AIM ä¼ºæœå™¨æš«æ™‚ç„¡æ³•é€å‡ºæ‚¨çš„å¥½å‹æ¸…å–®ã€‚ä¸éŽé€™å€‹å¥½å‹æ¸…å–®ä¸¦æ²’æœ‰éºå¤±ï¼Œå¯èƒ½å¯ä»¥åœ¨å¹¾"
-"å€‹å°æ™‚å¾Œå–å¾—ã€‚"
+"åˆ†é˜å¾Œå–å¾—ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4951
-#: ../libpurple/protocols/oscar/oscar.c:4953
-#: ../libpurple/protocols/oscar/oscar.c:5181
-#: ../libpurple/protocols/oscar/oscar.c:5182
-#: ../libpurple/protocols/oscar/oscar.c:5187
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "å¤å…’å€‘"
 
-#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9259,17 +9459,17 @@ msgstr ""
 "å› ç‚ºæ‚¨çš„å¥½å‹æ³•å–®ä¸æœ‰å¤ªå¤šçš„å¥½å‹ï¼Œæ‰€ä»¥æ²’æœ‰è¾¦æ³•åŠ å…¥å¥½å‹ %sã€‚è«‹åœ¨ç§»é™¤éƒ¨ä»½å¥½å‹å¾Œé‡"
 "è©¦ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5099
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(æ²’æœ‰åå—)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5113
+#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "ç„¡æ³•æŠŠ %s åŠ å…¥å¥½å‹æ¸…å–®ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5230
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9279,23 +9479,23 @@ msgstr ""
 "å‘¢ï¼Ÿ"
 
 # NOTE é€™æ˜¯æˆ‘å€‘å…è¨±åˆ¥äººç™¼å‡ºçš„èªè‰è¦æ±‚å¾Œé¡¯ç¤ºçµ¦æˆ‘å€‘è‡ªå·±çœ‹çš„
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "çµ¦äºˆèªè‰"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "ä½¿ç”¨è€… %s å…è¨±äº†æ‚¨å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
 # NOTE é€™æ˜¯æˆ‘å€‘ç™¼å‡ºçš„èªè‰è¦æ±‚è¢«å°æ–¹å…è¨±æ™‚é¡¯ç¤ºçš„
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "èªè‰ç²å…"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5315
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9305,32 +9505,32 @@ msgstr ""
 "ä½¿ç”¨è€… %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†æ‚¨å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "èªè‰è¢«æ‹’"
 
 # NOTE: é€™è£¡çš„å—ç¾©ä¿‚ç”± #gaim çš„ MrHappy åŠ deryni æä¾›çš„
 # NOTE: KingAnt æä¾›çš„å—ç¾©æœ‰äº›ä¸åŒï¼Œæš«æ™‚ä¸äºˆç†æœƒ
-#: ../libpurple/protocols/oscar/oscar.c:5352
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "é »é“è™Ÿç¢¼(_E)ï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:5392
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "çµ¦äºˆäº†ç„¡æ•ˆçš„èŠå¤©å®¤åç¨±ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5461
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "ç„¡æ³•å‚³é€å³æ™‚è¨Šæ¯å½±åƒï¼›AIM èŠå¤©ä¸¦ä¸æ”¯æ´å³æ™‚è¨Šæ¯å½±åƒçš„å‚³é€ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5623
-#: ../libpurple/protocols/oscar/oscar.c:5628
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "é›¢é–‹è¨Šæ¯"
 
 # XXX å¥½åƒä¸å°ï¼Œåˆå¥½åƒæ²’å•é¡Œ
-#: ../libpurple/protocols/oscar/oscar.c:5628
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(æœå°‹ä¸)</i>"
 
@@ -9338,90 +9538,90 @@ msgstr " <i>(æœå°‹ä¸)</i>"
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX æ‰€ä»¥é€™æ‡‰è©²æ˜¯æœ‰å•é¡Œçš„è¯æ–‡ï¼Œä½†æš«æ™‚æƒ³ä¸åˆ°æ€Žæ¨£æ”¹å–„ - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5828
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store ç¶²ç«™é€£çµ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s çš„å¥½å‹èªªæ˜Ž"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "å¥½å‹èªªæ˜Žï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "æ‚¨é¸æ“‡äº†èˆ‡ %s é–‹å•Ÿä¸€å€‹ç›´æŽ¥å³æ™‚è¨Šæ¯ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5988
+#: ../libpurple/protocols/oscar/oscar.c:5984
 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:5994
+#: ../libpurple/protocols/oscar/oscar.c:5990
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "é€£ç·š(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6029
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "å–å¾— AIM è³‡è¨Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "ç·¨è¼¯å¥½å‹èªªæ˜Ž"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "å–å¾—ç‹€æ…‹è¨Šæ¯"
 
 # NOTE å°‡ã€Œç›´æŽ¥æ¶ˆæ¯ã€æ”¹è¯ç‚ºã€Œå³æ™‚è¨Šæ¯ã€
-#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "å³æ™‚è¨Šæ¯"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "é‡æ–°è¦æ±‚èªè‰"
 
 # NOTE Requireæ„ç‚ºã€Œéœ€è¦ã€ï¼Œä¸æ˜¯ã€Œè¦æ±‚ã€
-#: ../libpurple/protocols/oscar/oscar.c:6137
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "éœ€è¦èªè‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:6140
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "å…è¨±å…¶ä»–ä½¿ç”¨è€…åœ¨ç¶²è·¯ä¸ŠæŸ¥çœ‹æ‚¨ç›®å‰çš„ç‹€æ…‹ï¼ˆæœƒå°Žè‡´æ‚¨æ”¶åˆ°åžƒåœ¾è¨Šæ¯ï¼ï¼‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "ICQ éš±ç§é¸é Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "æ–°çš„æ ¼å¼æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "å¸³è™Ÿæ ¼å¼åŒ–åªèƒ½æ”¹è®Šå¤§å¯«ä»¥åŠç©ºç™½ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6218
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "è®Šæ›´åœ°å€ç‚ºï¼š"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>æ‚¨ä¸¦æ²’æœ‰åœ¨ç‰å¾…é©—è‰</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6267
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "æ‚¨ç›®å‰æ£åœ¨ç‰å¾…ä¸‹åˆ—å¥½å‹çš„èªè‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:6268
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9429,74 +9629,74 @@ msgstr ""
 "æ‚¨å¯ä»¥é‡æ–°è¦æ±‚é€™äº›å¥½å‹çš„èªè‰ï¼Œåªè¦åœ¨å¥½å‹æ¸…å–®ä¸ä»¥æ»‘é¼ å³éµé»žæ“Šä»–å€‘ï¼Œç„¶å¾Œé¸æ“‡"
 "ã€Œè¦æ±‚é‡æ–°èªè‰ã€ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6285
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "ä»¥é›»åéƒµä»¶åœ°å€ä¾†æ‰¾å°‹å¥½å‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "ä½¿ç”¨é›»åéƒµä»¶åœ°å€æœå°‹å¥½å‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:6287
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "è«‹è¼¸å…¥å°æ–¹çš„é›»åéƒµä»¶åœ°å€ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6290
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "æœå°‹(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6448
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "è¨å®šä½¿ç”¨è€…è³‡è¨Š (é€éŽç¶²é )..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "ä¿®æ”¹å¯†ç¢¼ (é€éŽç¶²é )"
 
-#: ../libpurple/protocols/oscar/oscar.c:6463
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "è¨å®šå³æ™‚è¨Šæ¯çš„è½‰é€ (é€éŽç¶²é )"
 
 #  NOTE è¯æ–‡æ›´å‹• by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "è¨å®šéš±ç§é¸é …..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "ç¢ºèªå¸³è™Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "é¡¯ç¤ºç›®å‰æ‰€è¨»å†Šçš„é›»åéƒµä»¶ä½å€"
 
-#: ../libpurple/protocols/oscar/oscar.c:6488
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "ä¿®æ”¹ç›®å‰æ‰€è¨»å†Šçš„é›»åéƒµä»¶ä½å€..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6495
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "é¡¯ç¤ºç‰å¾…èªè‰çš„å¥½å‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:6501
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "ä½¿ç”¨é›»åéƒµä»¶åœ°å€æœå°‹å¥½å‹..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6506
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "ä¾ç…§è³‡è¨Šå°‹æ‰¾å¥½å‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:6574
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "ä½¿ç”¨ã€ŒRecent Buddiesã€ç¾¤çµ„"
 
-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "é¡¯ç¤ºæ‚¨é–’ç½®å¤šä¹…æ™‚é–“"
 
-#: ../libpurple/protocols/oscar/oscar.c:6732
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9975,23 +10175,23 @@ msgstr "é€å‡ºå³æ™‚è¨Šæ¯å¤±æ•—ã€‚"
 msgid "Failed to send IM."
 msgstr "é€å‡ºå³æ™‚è¨Šæ¯å¤±æ•—ã€‚"
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Keep Alive éŒ¯èª¤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
-msgstr "å–å¾— Login Token éŒ¯èª¤"
+msgstr "å–å¾—ç™»å…¥ç¬¦è¨˜é€”ä¸ç™¼ç”ŸéŒ¯èª¤"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "ç„¡æ³•ç™»å…¥ï¼Œè«‹æª¢æŸ¥é™¤éŒ¯è¨˜éŒ„"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "ç„¡æ³•é€£çµã€‚"
 
@@ -10002,92 +10202,92 @@ msgstr "ç„¡æ³•é€£çµã€‚"
 # XXX libgaim/protocols/* - ã€ŒUnknownã€æŒ‡ä¸æ˜Žçš„å¥½å‹ç‹€æ…‹ï¼Œå¯èƒ½æ˜¯æŒ‡ã€Œä¸æ˜Žã€ï¼ˆé€šè¨Šç³»çµ±å›žå ±çš„ç‹€æ…‹æ˜¯ã€Œä¸æ˜Žã€ï¼‰
 # XXX                       æˆ–è€…ã€ŒæœªçŸ¥ã€ï¼ˆå‡ºç¾äº† Pidgin æœªè¦‹éŽçš„ç‹€æ…‹ä»£è™Ÿï¼‰
 # XXX - Ambrose 20061123
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "æœªçŸ¥ï¼ˆä»£ç¢¼ %dï¼‰"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "TCP ä½å€"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "UDP ä½å€"
 
 #  FIXME é€™æ˜¯æš«è¯ï¼Œä½†åœ¨æœ‰é™çš„è³‡æ–™ä¸‹ï¼ˆæˆ‘æ²’æœ‰QQå¸³æˆ¶ï¼‰æ‡‰è©²æ˜¯å¤§è‡´æ£ç¢ºçš„è¯æ³• - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "æˆé•·éšŽæ®µ"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "åç¨±ç„¡æ•ˆ"
 
 #  NOTE åƒè¦‹ qq.h
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>ç›®å‰ä¸Šç·šå¥½å‹</b>: %d äºº<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</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>Connection Mode</b>: %s<br>\n"
 msgstr "<b>é€£ç·šæ¨¡å¼</b>ï¼š%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>ä¼ºæœå™¨ä½å€ï¼š</b>%sï¼š%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</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>Login Time</b>: %s<br>\n"
 msgstr "<b>ç™»å…¥æ™‚é–“ï¼š</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>ä¸Šæ¬¡ç™»å…¥ä½å€ï¼š</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>ä¸Šæ¬¡ç™»å…¥æ™‚é–“ï¼š</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "ç™»å…¥è³‡è¨Š"
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "è¨å®šæˆ‘çš„è³‡è¨Š"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "ä¿®æ”¹å¯†ç¢¼"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "é¡¯ç¤ºç™»å…¥è³‡è¨Š"
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "é›¢é–‹é€™å€‹ QQ ç¾¤ (Qun)"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "å°éŽ–é€™å€‹å¥½å‹"
 
@@ -10101,19 +10301,19 @@ msgstr "å°éŽ–é€™å€‹å¥½å‹"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ å”å®šæ¨¡çµ„"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "ä½¿ç”¨ TCP é€£çµ"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Socket éŒ¯èª¤"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "ç„¡æ³•è®€å– Socket"
 
@@ -10132,13 +10332,12 @@ msgstr "%d å–æ¶ˆäº†ã€Œ%sã€çš„å‚³é€"
 msgid "%d canceled the transfer of %s"
 msgstr "%d å–æ¶ˆäº†ã€Œ%sã€çš„å‚³é€"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "é€£ç·šä¸æ–·"
 
 # FIXME è¯æ–‡æœ‰å¾…æ”¹é€²  - 20070912 acli
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "ç™»å…¥å¤±æ•—ï¼Œæ²’æœ‰å›žæ‡‰"
 
@@ -10189,174 +10388,174 @@ msgstr "%s ä¸åœ¨æ‚¨çš„å¥½å‹æ¸…å–®å…§"
 msgid "%s is not in your buddy list"
 msgstr "%s ä¸åœ¨æ‚¨çš„å¥½å‹æ¸…å–®å…§"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "é€£ç·šé—œé–‰ï¼ˆå¯«å…¥ï¼‰"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>ç¾¤çµ„åç¨±ï¼š</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes ç¾¤çµ„ IDï¼š</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "é—œæ–¼ç¾¤çµ„ %s çš„è³‡è¨Š"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Notes é€šè¨ŠéŒ„è³‡è¨Š"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "é‚€è«‹æ•´å€‹ç¾¤çµ„é€²å…¥æœƒè°å®¤..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "å–å¾— Notes é€šè¨ŠéŒ„è³‡è¨Š"
 
 # NOTE è¦‹cnscode.org.tw
 # FIXME è¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "å‚³é€äº¤æ¡ä¸"
 
 # NOTE è¦‹cnscode.org.tw
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "ç‰å¾…äº¤æ¡å›žæ‡‰"
 
 # NOTE è¦‹cnscode.org.tw
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "æ”¶åˆ°äº¤æ¡å›žæ‡‰ï¼Œé€å‡ºç™»å…¥è¦æ±‚ä¸"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "ç‰å¾…ç™»å…¥è¦æ±‚çš„å›žæ‡‰"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "ç™»å…¥å·²è¢«é‡æ–°å°Žå‘"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "å¼·è¡Œç™»å…¥ä¸"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "ç™»å…¥è¦æ±‚æ”¶åˆ°å›žæ‡‰"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "å•Ÿå‹•æœå‹™"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "åœ¨ä¼ºæœå™¨ã€Œ%sã€ä¸Šï¼Œæœ‰ Sametime ç®¡ç†äººç™¼å‡ºäº†ä¸‹åˆ—é€šå‘Š"
 
 # FIXME é€™å¥½åƒä¸é€šé † - 20061025
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime ç®¡ç†äººé€šå‘Š"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "é€£ç·šé‡ç½®"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "è®€å– Socket æ™‚ç™¼ç”ŸéŒ¯èª¤ï¼›%s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "ç„¡æ³•é€£ç·šåˆ°ä¸»æ©Ÿ"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "è‡ª %s ç™¼ä½ˆ"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "æœƒè°å®¤é—œé–‰"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š"
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Place å·²é—œé–‰"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "éº¥å…‹é¢¨"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "å–‡å"
 
 # XXX æš«è¯
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "è¦–è¨Š"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "æ”¯æ´"
 
 #  XXX æ€ª
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "å¤–éƒ¨ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "èˆ‡ä½¿ç”¨è€…å»ºç«‹æœƒè°å®¤"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, 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:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "æ–°æœƒè°å®¤"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "å»ºç«‹"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "ç¾æœ‰æœƒè°å®¤"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "é–‹å•Ÿæ–°æœƒè°å®¤..."
 
 # NOTEã€Œæœƒè°å®¤ã€æ˜¯æš«æ™‚çš„æ„è¯ã€‚Yahoo! å¥½åƒæ²’æœ‰ç‚ºã€ŒConferenceã€æä¾›æ£å¼ä¸è¯åã€‚
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "é‚€è«‹ä½¿ç”¨è€…é€²å…¥æœƒè°å®¤"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10367,29 +10566,29 @@ msgstr ""
 "è°å®¤ï¼Œä¸¦ä¸”é‚€è«‹é€™å€‹ä½¿ç”¨è€…åŠ å…¥ï¼Œæ‚¨å¯ä»¥é¸æ“‡ã€Œé–‹å•Ÿæ–°æœƒè°å®¤ã€é¸é …ã€‚"
 
 # NOTEã€Œæœƒè°å®¤ã€æ˜¯æš«æ™‚çš„æ„è¯ã€‚Yahoo! å¥½åƒæ²’æœ‰ç‚ºã€ŒConferenceã€æä¾›æ£å¼ä¸è¯åã€‚
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "é‚€è«‹é€²å…¥æœƒè°å®¤"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "é‚€è«‹é€²å…¥æœƒè°å®¤"
 
 #  XXX è¦è¦†æŸ¥ - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "é€å‡ºæ¸¬è©¦é€šå‘Š"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "ä¸»é¡Œï¼š"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "æœªæŒ‡å®š Sametime ç¤¾ç¾¤ä¼ºæœå™¨"
 
 # NOTEã€ŒMeanwhileã€æŒ‡å¯¦ä½œã€ŒSametimeã€å”å®šçš„ä¸€å€‹è»Ÿé«”ï¼Œä¸æ˜¯é€£æŽ¥è©ž
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10399,43 +10598,43 @@ msgstr ""
 "å…¥ã€‚"
 
 # NOTEã€ŒMeanwhileã€æŒ‡å¯¦ä½œã€ŒSametimeã€å”å®šçš„ä¸€å€‹è»Ÿé«”ï¼Œä¸æ˜¯é€£æŽ¥è©ž
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile é€£ç·šè¨å®š"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "æœªæŒ‡å®š Sametime ç¤¾ç¾¤ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4368
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "é€£ç·š"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "æœªçŸ¥ï¼ˆ0x%04xï¼‰<br>"
 
 #  XXX è¦è¦†æŸ¥
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "ä¸Šæ¬¡ä½¿ç”¨çš„ç”¨æˆ¶ç«¯ç¨‹å¼ï¼ˆå¦‚å·²çŸ¥ï¼‰"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "ä½¿ç”¨è€…åç¨±"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "è¼¸å…¥äº†ä¸€å€‹ä¸æ˜Žç¢ºçš„ä½¿ç”¨è€… ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10444,16 +10643,16 @@ msgstr ""
 "ã€Œ%sã€å¯èƒ½æŒ‡ä¸‹åˆ—ä»»ä½•ä¸€å€‹ä½¿ç”¨è€…ã€‚è«‹å¾žæ¸…å–®é¸æ“‡æ£ç¢ºçš„ä½¿ç”¨è€…ï¼Œä»¥ä¾¿æ–°å¢žè‡³å¥½å‹æ¸…å–®"
 "å…§ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "é¸æ“‡ä½¿ç”¨è€…"
 
 #  TODO è«‹è¦†æŸ¥ï¼Œè¯æ–‡æœ‰å¾…æ”¹é€²
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "ç„¡æ³•æ–°å¢žä½¿ç”¨è€…ï¼šæ‰¾ä¸åˆ°ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10462,7 +10661,7 @@ msgstr ""
 "ã€Œ%sã€èˆ‡æ‚¨åœ¨ Sametime ç¤¾ç¾¤ä¸çš„ä»»ä½•ä½¿ç”¨è€…å¸³è™Ÿä¸ç¬¦ã€‚å®ƒå°‡å¾žæ‚¨çš„å¥½å‹æ¸…å–®ä¸è¢«ç§»"
 "é™¤ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10471,63 +10670,63 @@ msgstr ""
 "è®€å–æª”æ¡ˆ %s ç™¼ç”ŸéŒ¯èª¤ï¼›\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "å¥½å‹æ¸…å–®å˜æ”¾æ–¼é ç«¯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "å¥½å‹æ¸…å–®å„²å˜æ¨¡å¼"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "å¥½å‹æ¸…å–®åªå˜æ”¾æ–¼æœ¬æ©Ÿ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "åˆä½µä¼ºæœå™¨ä¸Šçš„å¥½å‹æ¸…å–®è‡³æœ¬æ©Ÿ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "åˆä½µä¸¦å˜æ”¾å¥½å‹æ¸…å–®è‡³ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "èˆ‡ä¼ºæœå™¨åŒæ¥æ¸…å–®"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "åŒ¯å…¥ Sametime æ¸…å–®çµ¦å¸³è™Ÿã€Œ%sã€"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "åŒ¯å‡º Sametime æ¸…å–®çµ¦å¸³è™Ÿã€Œ%sã€"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "ç„¡æ³•æ–°å¢žç¾¤çµ„ï¼šç¾¤çµ„å·²å˜åœ¨"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "ç¾¤çµ„åç¨±ã€Œ%sã€å·²ç¶“å˜åœ¨æ–¼æ‚¨çš„å¥½å‹æ¸…å–®ä¸ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "ç„¡æ³•æ–°å¢žç¾¤çµ„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "å¯èƒ½ç›¸ç¬¦çš„é …ç›®"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Notes é€šè¨ŠéŒ„çµæžœ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10537,26 +10736,26 @@ msgstr ""
 "ã€Œ%sã€å¯èƒ½åƒè€ƒåˆ°ä¸‹åˆ—çš„ Notes é€šè¨ŠéŒ„ç¾¤çµ„ã€‚è«‹è‡ªä¸‹æ–¹é¸å–æ£ç¢ºçš„ç¾¤çµ„ï¼Œä»¥åŠ å…¥æ‚¨çš„å¥½"
 "å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "é¸æ“‡ Notes é€šè¨ŠéŒ„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "ç„¡æ³•æ–°å¢žç¾¤çµ„ï¼šæ‰¾ä¸åˆ°ç¾¤çµ„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "åœ¨æ‚¨çš„ Sametime ç¤¾ç¾¤ä¸ï¼Œä¸¦æ²’æœ‰ä»»ä½•èˆ‡ã€Œ%sã€ç›¸ç¬¦çš„ Notes é€šè¨ŠéŒ„ç¾¤çµ„ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Notes é€šè¨ŠéŒ„ç¾¤çµ„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 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."
@@ -10564,12 +10763,12 @@ msgstr ""
 "è¼¸å…¥ Notes é€šè¨ŠéŒ„ç¾¤çµ„åç¨±æ–¼æ¬„ä½ä¸ï¼Œä»¥æ–°å¢žé€™å€‹ç¾¤çµ„åŠå®ƒæ‰€å±¬çš„æˆå“¡åˆ°æ‚¨çš„å¥½å‹æ¸…å–®"
 "ä¸ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "å°ã€Œ%sã€çš„æœå°‹çµæžœ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10579,59 +10778,59 @@ msgstr ""
 "ã€Œ%sã€å¯èƒ½æŒ‡ä¸‹åˆ—ä»»ä½•ä¸€å€‹ä½¿ç”¨è€…ã€‚æ‚¨å¯ä½¿ç”¨ä¸‹é¢çš„æŒ‰ç´ï¼ŒæŠŠä»–ï¼ˆå¥¹ï¼‰å€‘æ–°å¢žè‡³å¥½å‹æ¸…"
 "å–®å…§ï¼Œæˆ–å‘ä»–ï¼ˆå¥¹ï¼‰å€‘ç™¼å‡ºè¨Šæ¯ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "æœå°‹çµæžœ"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "æ²’æœ‰ç›¸ç¬¦åˆçš„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "ã€Œ%sã€èˆ‡æ‚¨åœ¨ Sametime ç¤¾ç¾¤ä¸çš„ä»»ä½•ä½¿ç”¨è€…å¸³è™Ÿä¸ç¬¦ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "æ²’æœ‰ç›¸ç¬¦åˆçš„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "æœå°‹ä¸€å€‹ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "è¼¸å…¥å§“åæˆ–éƒ¨ä»½ ID æ–¼ä¸‹æ–¹çš„æ¬„ä½ï¼Œä¾†æŸ¥è©¢æ‚¨ Sametime ç¤¾ç¾¤ä¸ç¬¦åˆçš„ä½¿ç”¨è€…ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "ä½¿ç”¨è€…æœå°‹"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "åŒ¯å…¥ Sametime æ¸…å–®..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "åŒ¯å‡º Sametime æ¸…å–®..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "æ–°å¢ž Notes é€šè¨ŠéŒ„ç¾¤çµ„"
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "ä½¿ç”¨è€…æœå°‹..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "å¼·è¡Œç™»å…¥ï¼ˆå¿½ç•¥ä¼ºæœå™¨é‡æ–°å°Žå‘ï¼‰"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "éš±è—å®¢æˆ¶ç«¯è˜åˆ¥"
 
@@ -10760,8 +10959,8 @@ msgstr "è¨å®šå³æ™‚è¨Šæ¯å¯†ç¢¼"
 #: ../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/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10770,8 +10969,8 @@ msgstr "å–å¾—å…¬é‘°"
 msgstr "å–å¾—å…¬é‘°"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10779,17 +10978,17 @@ msgstr "ç„¡æ³•å–å¾—å…¬é‘°"
 msgstr "ç„¡æ³•å–å¾—å…¬é‘°"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "é¡¯ç¤ºå…¬é‘°"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "ç„¡æ³•è¼‰å…¥å…¬é‘°"
@@ -10797,9 +10996,9 @@ msgstr "ç„¡æ³•è¼‰å…¥å…¬é‘°"
 #: ../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/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10811,7 +11010,7 @@ msgstr "ä½¿ç”¨è€…è³‡è¨Š"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10834,257 +11033,257 @@ msgstr ""
 "é‘°ã€æŒ‡ä»¤å³å¯ã€‚"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "é–‹å•Ÿ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "å¥½å‹ %s ä¸åœ¨ç¶²è·¯ä¸Š"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 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:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "åŒ¯å…¥(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "é¸æ“‡æ£ç¢ºçš„ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 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:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 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:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "æš«åœé€£ç·š"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "ä¸é©"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "å«é†’æˆ‘ï¼"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "æ¥µåº¦æ´»èº"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "æ©Ÿæ¢°äºº"
 
-#: ../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/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "é–‹å¿ƒ"
 
-#: ../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/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "æ†‚æ„"
 
-#: ../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/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "æ†¤æ€’"
 
-#: ../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/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "å«‰å¦’"
 
-#: ../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/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "æ…šæ„§"
 
-#: ../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/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "ç„¡æ•µ"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "æˆ€æ„›ä¸"
 
-#: ../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/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "æƒ³ç¡"
 
-#: ../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/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "ç™¼æ‚¶"
 
-#: ../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/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "èˆˆå¥®"
 
-#: ../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/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "æ†‚æ…®"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "ä½¿ç”¨è€…æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "è¯çµ¡æ–¹æ³•"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "é¸ç”¨èªžæ–‡"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "æ‰€ç”¨è£ç½®"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../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:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "æ‰€åœ¨ä½ç½®"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "æ¸…é™¤å³æ™‚è¨Šæ¯å¯†é‘°"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "è¦äº¤æ›å¯†é‘°ä¹‹å³æ™‚è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "æœ‰å¯†ç¢¼ä¹‹å³æ™‚è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "å–å¾—å…¬é‘°..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "å¾žç¶²è·¯ä¸Šç§»é™¤ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "åœ¨ç™½æ¿ä¸Šç¹ªåœ–"
@@ -11101,7 +11300,7 @@ msgstr "é »é“ %s ä¸åœ¨ç¶²è·¯ä¸Š"
 msgstr "é »é“ %s ä¸åœ¨ç¶²è·¯ä¸Š"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11154,40 +11353,40 @@ msgstr "<br><b>é »é“æ¨¡å¼ï¼š</b>"
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>é »é“æ¨¡å¼ï¼š</b>"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../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:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>å‰µç«‹è€…ä¹‹å…¬é‘°æŒ‡ç´‹å¯è®€ç‰ˆæœ¬ (Babbleprint)ï¼š</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "æ–°å¢žé »é“å…¬é‘°"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "é–‹å•Ÿå…¬é‘°..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "é »é“å¯†ç¢¼"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "é »é“å…¬é‘°æ¸…å–®"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -11201,11 +11400,11 @@ msgstr ""
 "é“å°±å¿…é ˆæ“æœ‰æ‰€åˆ—å…¬é‘°å…§ä¹‹å…¶ä¸€ã€‚"
 
 #  XXX æš«è¯
-#: ../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/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11214,147 +11413,147 @@ msgstr "é »é“èªè‰"
 msgid "Channel Authentication"
 msgstr "é »é“èªè‰"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "æ–°å¢žï¼ç§»é™¤"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "èŠå¤©å®¤åç¨±"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../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:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../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:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "æ–°å¢žé »é“å°åœˆå"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "ä½¿ç”¨è€…æ•¸ç›®ä¸Šé™"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "è¨å®šä½¿ç”¨è€…æ•¸ç›®ä¸Šé™ï¼›è¦æ¸…é™¤ä½¿ç”¨è€…æ•¸ç›®ä¸Šé™ï¼Œè¼¸å…¥é›¶å³å¯ã€‚"
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "é‚€è«‹æ¸…å–®"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "ç¦æ¢æ¸…å–®"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "æ–°å¢žå°åœˆå"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "æ¸…é™¤æ°¸ä¹…æ€§é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "è¨å®šæ°¸ä¹…æ€§é »é“æ¨¡å¼"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "è¨å®šä½¿ç”¨è€…æ•¸ç›®ä¸Šé™"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "æ¸…é™¤ä¸»é¡Œé™åˆ¶"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "è¨å®šä¸»é¡Œé™åˆ¶"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "æ¸…é™¤ç§ç”¨é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "è¨å®šç§ç”¨é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "æ¸…é™¤ç§˜å¯†é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "è¨å®šç§˜å¯†é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../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:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "åŠ å…¥å°åœˆå"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "ç„¡æ³•åŠ å…¥å°åœˆå"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "å‘¼å«æŒ‡ä»¤"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "ç„¡æ³•åŸ·è¡ŒæŒ‡ä»¤"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "æœªçŸ¥çš„æŒ‡ä»¤"
 
@@ -11514,7 +11713,7 @@ msgstr "è·è²¬"
 msgstr "è·è²¬"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11549,7 +11748,7 @@ msgstr "<I>%s</I> çš„é »é“å‰µç«‹è€…ç‚º 
 msgstr "<I>%s</I> çš„é »é“å‰µç«‹è€…ç‚º <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11561,91 +11760,91 @@ msgstr "ç‹€æ…‹è¨Šæ¯"
 msgid "Status Text"
 msgstr "ç‹€æ…‹è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "å…¬é‘°æŒ‡ç´‹"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "å…¬é‘°æŒ‡ç´‹å¯è®€ç‰ˆæœ¬ (Babbleprint)"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "æ›´å¤š(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "èˆ‡ä¼ºæœå™¨æš«åœé€£ç·š"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "ç„¡æ³•æš«åœé€£ç·š"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "ç„¡æ³•è¨å®šä¸»é¡Œ"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "ç„¡æ³•æ›´æ”¹æš±ç¨±"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "èŠå¤©å®¤æ¸…å–®"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "ç„¡æ³•å–å¾—èŠå¤©å®¤æ¸…å–®"
 
 #  FIXME çœ‹äº†åŽŸå§‹ç¢¼ä¹Ÿä¸çŸ¥æ‰€äº‘ï¼Œæ‰€ä»¥å¤§æ¦‚æœƒæ˜¯è¯éŒ¯ - acli 20070614
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "é€™å€‹ç¶²è·¯æ˜¯ç©ºç™½çš„"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "æ²’æœ‰æ”¶åˆ°å…¬é‘°"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "ä¼ºæœå™¨è³‡è¨Š"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "ç„¡æ³•å–å¾—ä¼ºæœå™¨è³‡è¨Š"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../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:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "ç„¡æ³•å–å¾—ä¼ºæœå™¨çš„çµ±è¨ˆè³‡æ–™"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11681,55 +11880,55 @@ msgstr ""
 "ä¼ºæœå™¨ç®¡ç†è€…ç¸½æ•¸ï¼š%d äºº\n"
 "è·¯ç”±å™¨ç®¡ç†è€…ç¸½æ•¸ï¼š%d äºº\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "ç¶²è·¯çµ±è¨ˆè³‡æ–™"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping å¤±æ•—"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "ç”±ä¼ºæœå™¨æ”¶åˆ° Ping å›žæ‡‰"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "ç„¡æ³•å‚±ç¶²è·¯ä¸Šç§»é™¤ä½¿ç”¨è€…"
 
 #  XXX acli 20070614
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "WATCH"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 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/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../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:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "ç‚ºé€£ç·šé€²è¡Œé©—è‰ä¸"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "æ ¸å¯¦ä¼ºæœå™¨çš„å…¬é‘°ä¸"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "å¿…é ˆè¼¸å…¥å¯†ç¢¼"
@@ -11773,83 +11972,83 @@ msgstr "ä¸æ”¯æ´çš„å…¬é‘°é¡žåž‹"
 msgid "Unsupported public key type"
 msgstr "ä¸æ”¯æ´çš„å…¬é‘°é¡žåž‹"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "ä¼ºæœå™¨ä¸æ–·äº†é€£ç·š"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "é€£ç·šè‡³ SILC ä¼ºæœå™¨æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "å¯†é‘°äº¤æ›å¤±æ•—"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../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/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "é€£ç·šå¤±æ•—"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "äº¤æ›å¯†é‘°ä¸"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "é€£ç·šè‡³ SILC ä¼ºæœå™¨ä¸"
 
-#: ../libpurple/protocols/silc/silc.c:352
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "ç„¡æ³•è®€å– SILC å¯†é‘°å°"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "ç„¡æ³•å»ºç«‹é€£çµ"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "è¨˜æ†¶é«”ä¸å¤ "
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "ç„¡æ³•åˆå§‹åŒ– SILC å”å®š"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "è®€å– SILC å¯†é‘°å°é€”ä¸å‡ºç¾éŒ¯èª¤"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "æ‚¨ç›®å‰çš„å¿ƒæƒ…"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1643
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "æ£å¸¸"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "æˆ€æ„›ä¸"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11858,66 +12057,66 @@ msgstr ""
 "\n"
 "è¯çµ¡æ–¹æ³•"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "è¦–è¨Šæœƒè°ä¸"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "ç›®å‰ç‹€æ…‹"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "æ‰€ç”¨ä¹‹ç·šä¸Šæœå‹™"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "è®“ä»–äººå¯ä»¥å¾—çŸ¥æ‚¨ä½¿ç”¨é‚£äº›ç·šä¸Šæœå‹™"
 
 #  NOTE XXX åŽŸå§‹ç¢¼é¡¯ç¤ºé€™å€‹å…¶å¯¦ä¸æ˜¯é›»è…¦é¡žåž‹ï¼Œè€Œæ˜¯æ“ä½œç³»çµ±ç‰ˆæœ¬ :-/
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "å®¹è¨±åˆ¥äººæŸ¥çœ‹æ‚¨ç”¨çš„æ˜¯ä»€éº¼é›»è…¦"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "æ‚¨çš„ VCard æª”æ¡ˆ"
 
 #  XXX çœ‹äº†åŽŸå§‹ç¢¼ä¹Ÿä¸çŸ¥æ‰€äº‘ï¼Œæš«æ™‚åªæœ‰ç›´è¯äº†äº‹
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "æ™‚å€ (UTC)"
 
 #  XXX å¥½åƒå¾ˆæ€ª
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "ä½¿ç”¨è€…ä¸Šç·šç‹€æ…‹å±¬æ€§"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11927,31 +12126,31 @@ msgstr ""
 "æ‚¨å¯ä»¥çµ¦å…¶ä»–ä½¿ç”¨è€…çœ‹è¦‹æ‚¨çš„ä¸Šç·šç‹€æ…‹åŠå€‹äººè³‡è¨Šã€‚æœ‰é—œæ‚¨çš„è³‡è¨Šï¼Œåªé ˆè¼¸å…¥æ‚¨å¸Œæœ›åˆ¥"
 "äººçœ‹å¾—è¦‹çš„å„é …ã€‚"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "æ˜¯æ—¥è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "æ²’æœ‰æ˜¯æ—¥è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "é€™å€‹é€£çµæ²’æœ‰ç›¸é—œçš„æ˜¯æ—¥è¨Šæ¯"
 
-#: ../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/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11959,187 +12158,187 @@ msgstr "ç”¢ç”Ÿæ–°çš„ SILC å¯†éŒ€å°"
 msgid "Create New SILC Key Pair"
 msgstr "ç”¢ç”Ÿæ–°çš„ SILC å¯†éŒ€å°"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "å¯†ç¢¼ä¸ç¬¦"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "å¯†é‘°å°ç”¢ç”Ÿå¤±æ•—"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "å¯†é‘°é•·åº¦"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "å…¬é‘°æª”æ¡ˆ"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "ç§é‘°æª”æ¡ˆ"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "å¯†ç¢¼ï¼ˆå†æ¬¡è¼¸å…¥ï¼‰"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "ç”¢ç”Ÿå¯†é‘°å°"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "ä¸Šç·šç‹€æ…‹"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "é¡¯ç¤ºæ˜¯æ—¥è¨Šæ¯ (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "ç”¢ç”Ÿ SILC å¯†é‘°å°..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "ä½¿ç”¨è€… <I>%s</I> ä¸åœ¨ç¶²è·¯ä¸Š"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "èŠå¤©ä¸»é¡ŒéŽé•·"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "å¿…é ˆæŒ‡å®šæš±ç¨±"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "æ‰¾ä¸åˆ°æœƒè° %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s çš„é »é“æ¨¡å¼ç‚ºï¼š%s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s æ²’æœ‰è¨å®šé »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "ç„¡æ³•ç‚º %s è¨å®šé »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "æœªçŸ¥çš„æŒ‡ä»¤ï¼š%sï¼ˆå¯èƒ½æ˜¯å®¢æˆ¶ç«¯çš„éŒ¯èª¤ï¼‰"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [é »é“]ï¼šé›¢é–‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [é »é“]ï¼šé›¢é–‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;æ–°ä¸»é¡Œ&gt;]ï¼šæª¢è¦–æˆ–ä¿®æ”¹èŠå¤©ä¸»é¡Œ"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 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:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "listï¼šåˆ—å‡ºç›®å‰åœ¨ç¶²çµ¡ä¸Šçš„èŠå¤©å®¤æ¸…å–®"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;æš±ç¨±&gt;ï¼šæŸ¥çœ‹é€™å€‹æš±ç¨±çš„ç›¸é—œè³‡è¨Š"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../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:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 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:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motdï¼šé¡¯ç¤ºä¼ºæœå™¨çš„æ˜¯æ—¥è¨Šæ¯ (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detachï¼šæš«åœé€£ç·šé€™å€‹å·¥ä½œéšŽæ®µ"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [è¨Šæ¯]ï¼šè‡ªä¼ºæœå™¨é›¢ç·šï¼Œä¸¦å¯é¸æ“‡é€å‡ºæŒ‡å®šçš„è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;æŒ‡ä»¤&gt;ï¼šåŸ·è¡Œ SILC æŒ‡å®šçš„ç”¨æˆ¶ç«¯æŒ‡ä»¤"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;æš±ç¨±&gt; [-pubkey|&lt;ç†ç”±&gt;]ï¼šå¾žç¶²è·¯ä¸Šç§»é™¤æš±ç¨±"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;æ–°æš±ç¨±&gt;ï¼šæ”¹è®Šæ‚¨çš„æš±ç¨±"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;æš±ç¨±&gt;ï¼šæŸ¥çœ‹æš±ç¨±çš„ç›¸é—œè³‡è¨Š"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 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:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12147,18 +12346,18 @@ msgstr ""
 "cumode &lt;é »é“&gt; +|-&lt;æ¨¡å¼&gt; &lt;æš±ç¨±&gt;ï¼šåœ¨æŒ‡å®šé »é“ä¿®æ”¹æŒ‡å®šçš„æš±ç¨±çš„"
 "æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;ä½¿ç”¨è€…æ¨¡å¼&gt;ï¼šè¨å®šæ‚¨åœ¨ç¶²è·¯ä¸Šçš„æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;æš±ç¨±&gt; [-pubkey]ï¼šå–å¾—ä¼ºæœå™¨ç®¡ç†è€…çš„æ¬Šé™"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12166,45 +12365,45 @@ msgstr ""
 "invite &lt;é »é“&gt; [-|+]&lt;æš±ç¨±&gt;ï¼šé‚€è«‹æŒ‡å®šçš„æš±ç¨±ã€æ–°å¢žæŒ‡å®šçš„æš±ç¨±åˆ°é »é“çš„"
 "è¢«é‚€è€…åˆ—è¡¨ã€æˆ–æŠŠæŒ‡å®šçš„æš±ç¨±å¾žé »é“çš„è¢«é‚€è€…åˆ—è¡¨ä¸ç§»é™¤"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;é »é“&gt; &lt;æš±ç¨±&gt; [å‚™è¨»]ï¼šæŠŠæŒ‡å®šçš„æš±ç¨±å¾žé »é“ä¸è¸¢å‡º"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [ä¼ºæœå™¨]ï¼šè§€çœ‹ä¼ºæœå™¨çš„ç®¡ç†ç´°ç¯€"
 
 #  XXX æš«è¯
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;é »é“&gt; +|-&lt;æš±ç¨±&gt;]ï¼šæ–¼æŒ‡å®šçš„é »é“ç¦æ¢æŒ‡å®šçš„ç”¨æˆ¶ç«¯"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;æš±ç¨±|ä¼ºæœå™¨&gt;ï¼šå–å¾—ç”¨æˆ¶ç«¯æˆ–ä¼ºæœå™¨çš„å…¬é‘°"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "statsï¼šè§€çœ‹ä¼ºæœå™¨åŠç¶²è·¯çš„çµ±è¨ˆè³‡æ–™"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "pingï¼šå‘é€£çµçš„ä¼ºæœå™¨é€å‡º PING"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;é »é“&gt;ï¼šåˆ—å‡ºé »é“ä¸çš„ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12221,146 +12420,146 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC å”å®šæ¨¡çµ„"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "å®‰å…¨æ€§ç¶²éš›ç¶²è·¯å³æ™‚æœƒè° (SILC) å”å®š"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2038
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "ç¶²è·¯"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "å…¬é‘°æª”æ¡ˆ"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "ç§é‘°æª”æ¡ˆ"
 
 # XXX æš«è¯ - 20061025
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "åŠ å¯†æ–¹æ³•"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX è¯æ–‡æºè‡ª http://www.cert.org.tw/document/column/show.php?key=28
 #  XXX ä½†å…¶å¯¦è¯æ–‡ä¸¦ä¸çµ±ä¸€ - acli 20070614
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "ä½¿ç”¨å®Œå…¨å‘å‰ä¿å¯† (PFS)"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "ä½¿ç”¨å…¬é‘°èªè‰"
 
 #  XXX å¥½åƒè½ä¾†å¾ˆæ€ª
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "æ‹’çµ•æ²’æœ‰äº¤æ›å¯†é‘°çš„å³æ™‚è¨Šæ¯"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "ç¦æ¢å‚³é€è¨Šæ¯è‡³ç™½æ¿"
 
 # XXX æš«è¯
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "è‡ªå‹•æ‰“é–‹ç™½æ¿"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "æ•¸ä½ç°½ç½²æ‰€æœ‰å³æ™‚è¨Šæ¯"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../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
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "ç„¡æ³•ç”¢ç”Ÿ SILC å¯†é‘°å°\n"
 
 #. 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:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "å§“åï¼šã€€ã€€ã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "ä½¿ç”¨è€…åç¨±ï¼š\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../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:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "ä¸»æ©Ÿåç¨±ï¼šã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "æ‰€å±¬æ©Ÿæ§‹ï¼šã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "åœ‹å®¶ï¼šã€€ã€€ã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "æ¼”ç®—æ³•ï¼šã€€ã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "å¯†é‘°é•·åº¦ï¼šã€€\t%d å€‹ä½å…ƒ\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "ç‰ˆæœ¬ï¼šã€€ã€€ã€€\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12372,7 +12571,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12382,51 +12581,51 @@ msgstr ""
 "å…¬é‘°æŒ‡ç´‹å¯è®€ç‰ˆæœ¬ (Babbleprint)ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "å…¬é‘°è³‡è¨Š"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "å‚³å‘¼"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "è¦–åƒæœƒè°"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "é›»è…¦"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "é›»åæ‰‹å¸³"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "çµ‚ç«¯æ©Ÿ"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s å‚³é€è¨Šæ¯åˆ°ç™½æ¿ã€‚æ‚¨è¦é–‹å•Ÿç™½æ¿å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s å‚³é€è¨Šæ¯åˆ° %s é »é“çš„ç™½æ¿ã€‚æ‚¨è¦é–‹å•Ÿç™½æ¿å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "ç™½æ¿"
 
@@ -12494,36 +12693,35 @@ msgstr "ç„¡æ³•è®€å– SILC å¯†é‘°å°ï¼š%s
 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:417
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "ç„¡æ³•å¯«å…¥"
 
-#: ../libpurple/protocols/simple/simple.c:439
-#: ../libpurple/protocols/simple/simple.c:1545
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "ç„¡æ³•é€£çµ"
 
-#: ../libpurple/protocols/simple/simple.c:1062
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "ä¸æ˜Žçš„ä¼ºæœå™¨å›žæ‡‰ã€‚"
 
-#: ../libpurple/protocols/simple/simple.c:1579
-#: ../libpurple/protocols/simple/simple.c:1621
-#: ../libpurple/protocols/simple/simple.c:1634
-#: ../libpurple/protocols/simple/simple.c:1685
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "ç„¡æ³•å»ºç«‹ Socket ç›£è½"
 
-#: ../libpurple/protocols/simple/simple.c:1602
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "ç„¡æ³•è§£æžä¸»æ©Ÿ"
 
-#: ../libpurple/protocols/simple/simple.c:1693
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "ç„¡æ³•è§£æžä¸»æ©Ÿ"
 
-#: ../libpurple/protocols/simple/simple.c:1710
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP çš„å¸³è™Ÿä¸å¯å«æœ‰ç©ºç™½å—å…ƒæˆ–ã€Œ@ã€ç¬¦è™Ÿ"
 
@@ -12535,36 +12733,36 @@ msgstr "SIP çš„å¸³è™Ÿä¸å¯å«æœ‰ç©ºç™½å
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE é€šè¨Šå”å®šæ¨¡çµ„"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1894
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE é€šè¨Šå”å®šæ¨¡çµ„"
 
-#: ../libpurple/protocols/simple/simple.c:1922
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "åˆŠç™»ç‹€æ…‹ï¼ˆè«‹æ³¨æ„ï¼šä»»ä½•äººéƒ½èƒ½çœ‹åˆ°æ‚¨ï¼‰"
 
-#: ../libpurple/protocols/simple/simple.c:1928
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "ä½¿ç”¨ UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1930
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "ä½¿ç”¨ Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1932
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "ä»£ç†ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/simple/simple.c:1934
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "èªè‰ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/simple/simple.c:1936
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "èªè‰åŸŸå"
 
@@ -12728,8 +12926,8 @@ msgstr "å¯†ç¢¼ä¿®æ”¹æˆåŠŸ"
 msgid "Password Change Successful"
 msgstr "å¯†ç¢¼ä¿®æ”¹æˆåŠŸ"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5925
-#: ../pidgin/gtkblist.c:6281
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
+#: ../pidgin/gtkblist.c:6599
 msgid "_Group:"
 msgstr "ç¾¤çµ„(_G)ï¼š"
 
@@ -12854,45 +13052,45 @@ msgstr "å¿½ç•¥ä½¿ç”¨è€…ï¼Ÿ"
 msgid "Ignore buddy?"
 msgstr "å¿½ç•¥ä½¿ç”¨è€…ï¼Ÿ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "ä½ çš„å¸³æˆ¶ç›®å‰è¢«æš«æ™‚é—œé–‰ã€‚è«‹æ‚¨ç™»å…¥ Yahoo! ç¶²ç«™ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "æœªçŸ¥çš„éŒ¯èª¤ä»£ç¢¼ %dã€‚å·²ç¶“ç™»å…¥åˆ° Yahoo!ï¼Œå®˜æ–¹ç¶²ç«™ä¸Šå¯èƒ½å·²ç¶“ä¿®æ£é€™å€‹éŒ¯èª¤ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "ç„¡æ³•å°‡å¥½å‹ã€Œ%1$sã€æ–°å¢žè‡³å¸³è™Ÿã€Œ%3$sã€åœ¨ä¼ºæœå™¨ä¸Šçš„æ¸…å–®å…§çš„ç¾¤çµ„ã€Œ%2$sã€ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "ç„¡æ³•å°‡å¥½å‹æ–°å¢žè‡³ä¼ºæœå™¨ä¸Šçš„æ¸…å–®å…§"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ éŸ³æ•ˆæª” %s/%s/%s.swf ] %s"
 
 # XXX æš«è¯ - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2653
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "ä¼ºæœå™¨ç™¼å‡ºäº†å¥‡æ€ªçš„ HTTP å›žæ‡‰ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2677
-#: ../libpurple/protocols/yahoo/yahoo.c:2863
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "é€£ç·šéŒ¯èª¤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12901,7 +13099,7 @@ msgstr ""
 "èˆ‡ %s ä¹‹é–“çš„é€£ç·šçªç„¶ä¸æ–·:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2728
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12910,28 +13108,28 @@ msgstr ""
 "ç„¡æ³•èˆ‡ %s å»ºç«‹é€£ç·š:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "ä¸åœ¨å®¶"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "ä¸åœ¨åº§ä½"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "ä¸åœ¨è¾¦å…¬å®¤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "æ¸¡å‡åŽ»äº†"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "èµ°å‡ºåŽ»äº†"
 
@@ -12939,86 +13137,86 @@ msgstr "èµ°å‡ºåŽ»äº†"
 # NOTE é€™ä¹Ÿè¡¨ç¤ºä½ ä¸æœƒçœ‹è¦‹é€™å€‹å¥½å‹ç™»å…¥ç‰ç‰ã€‚ã€(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3188
-#: ../libpurple/protocols/yahoo/yahoo.c:3218
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "ä¸åœ¨ä¼ºæœå™¨ä¸Šçš„æ¸…å–®ä¸"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "å ±ç¨±ä¸Šç·š"
 
 # NOTE Yahoo å®˜æ–¹è¯ã€Œæ°¸é é¡¯ç¤ºé›¢ç·šã€ï¼Œèªªç™½ä¸€é»žå…¶å¯¦å³æ˜¯ï¼ˆé‡å°æŸäººï¼‰ã€Œé•·æœŸéš èº«ã€
-#: ../libpurple/protocols/yahoo/yahoo.c:3238
-#: ../libpurple/protocols/yahoo/yahoo.c:3314
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "é•·æœŸå ±ç¨±é›¢ç·š"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "ä¸Šç·šç‹€æ…‹"
 
 # NOTE ä¸‹æ¬¡ç™»å…¥æ™‚ä¸å ±ç¨±é›¢ç·šï¼Œæ‰€ä»¥åŠ ã€Œæš«æ™‚ã€å—çœ¼
-#: ../libpurple/protocols/yahoo/yahoo.c:3299
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "æš«æ™‚å ±ç¨±é›¢ç·š"
 
 #  NOTE é€™æ˜¯æ¸…å–®å…§çš„ä¸€å€‹æŒ‡ä»¤
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "åœæ¢é•·æœŸå ±ç¨±é›¢ç·š"
 
 # NOTE #gaim çš„ Vann åŠ LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
 # NOTE Yahoo çš„ã€ŒChatã€æ£å¼è¯æ–‡ç‚ºã€Œè¯èª¼åœ’åœ°ã€
-#: ../libpurple/protocols/yahoo/yahoo.c:3356
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
 
 # NOTEã€Œæœƒè°å®¤ã€æ˜¯æš«æ™‚çš„æ„è¯ã€‚Yahoo! å¥½åƒæ²’æœ‰ç‚ºã€ŒConferenceã€æä¾›æ£å¼ä¸è¯åã€‚
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "é–‹å•Ÿæœƒè°å®¤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3390
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "ä¸Šç·šç‹€æ…‹è¨å®š"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3396
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "é–‹å§‹ Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "å•Ÿç”¨å“ªä¸€å€‹ IDï¼Ÿ"
 
 # NOTE #gaim çš„ Vann åŠ LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
 # NOTE Yahoo çš„ã€ŒChatã€æ£å¼è¯æ–‡ç‚ºã€Œè¯èª¼åœ’åœ°ã€
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
 msgstr "åŠ å…¥èª°çš„èŠå¤©å®¤ï¼Ÿ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "å•Ÿå‹• ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
 msgstr "é–‹å•Ÿæ”¶ä»¶åŒ£"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &ltèŠå¤©å®¤&gt;ï¼šåŠ å…¥ä½æ–¼ Yahoo! ç¶²è·¯çš„ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "listï¼šåˆ—å‡ºYahooç¶²è·¯ä¸Šçš„èŠå¤©å®¤æ¸…å–®"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: è¦æ±‚ä½¿ç”¨è€…é–‹å§‹ Doodle Session"
 
@@ -13032,57 +13230,57 @@ msgstr "doodle: è¦æ±‚ä½¿ç”¨è€…é–‹å§‹ Do
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo å”å®šæ¨¡çµ„"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "å‚³å‘¼ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "å‚³å‘¼ä¼ºæœå™¨ï¼ˆæ—¥æœ¬åœ°å€ï¼‰"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "å‚³å‘¼ç³»çµ±é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "æª”æ¡ˆå‚³è¼¸ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "æª”æ¡ˆå‚³è¼¸ä¼ºæœå™¨ï¼ˆæ—¥æœ¬åœ°å€ï¼‰"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "æª”æ¡ˆå‚³è¼¸é€šè¨ŠåŸ "
 
 #  XXX ç„¡åŠƒä¸€è¯æ³•ï¼Œæœ‰è¯ã€Œåœ°å€ã€ã€ã€Œå€åŸŸã€ç”šè‡³ã€Œå ´æ‰€ã€(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "èŠå¤©å®¤å€åŸŸ (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "å¿½ç•¥æœƒè°å®¤èˆ‡èŠå¤©å®¤é‚€è«‹"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "èŠå¤©å®¤æ¸…å–®æ‰€åœ¨ç¶²å€"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Yahoo èŠå¤©ä¼ºæœå™¨"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Yahoo èŠå¤©å®¤é€šè¨ŠåŸ "
 
@@ -13100,7 +13298,6 @@ msgstr "ç„¡æ³•å»ºç«‹æª”æ¡ˆä»‹ç´¹ã€‚"
 msgid "Unable to establish file descriptor."
 msgstr "ç„¡æ³•å»ºç«‹æª”æ¡ˆä»‹ç´¹ã€‚"
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "å¯«å…¥éŒ¯èª¤"
@@ -13267,11 +13464,11 @@ msgstr "ä½¿ç”¨è€…å»ºç«‹ä¹‹èŠå¤©å®¤"
 msgid "User Rooms"
 msgstr "ä½¿ç”¨è€…å»ºç«‹ä¹‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "èˆ‡ YCHT ä¼ºæœå™¨å‡ºç¾é€£ç·šéŒ¯èª¤"
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13502,19 +13699,33 @@ msgstr "ç„¡æ³•è§£æžä¸»æ©Ÿ"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "æ˜¯(_Y)"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "å¦(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "æŽ¥å—(_A)"
 
@@ -13600,68 +13811,72 @@ msgstr "ä½¿ç”¨è¡Œå‹•è£ç½®"
 msgid "Mobile"
 msgstr "ä½¿ç”¨è¡Œå‹•è£ç½®"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "è½éŸ³æ¨‚ä¸"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s å¾žã€Œ%sã€ç‹€æ…‹æ”¹è®Šç‚ºã€Œ%sã€"
 
-#: ../libpurple/status.c:612
+#: ../libpurple/status.c:613
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) å¾žã€Œ%sã€ç‹€æ…‹æ”¹è®Šç‚ºã€Œ%sã€"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ç›®å‰ç‚º%s"
 
-#: ../libpurple/status.c:625
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) ç›®å‰ç‚º%s"
 
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ä¸å†%s"
 
-#: ../libpurple/status.c:633
+#: ../libpurple/status.c:634
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ä¸å†%s"
 
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s è®Šæ›´ç‹€æ…‹ç‚ºé–’ç½®"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ä¸å†é–’ç½®"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s è®Šæ›´ç‹€æ…‹ç‚ºé–’ç½®"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ä¸å†é–’ç½®"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "è®€å– %s é€”ä¸ç™¼ç”Ÿäº†éŒ¯èª¤"
 
 # NOTE ã€ŒTheyã€æ˜¯ä»€éº¼å‘¢ï¼Ÿè¯æˆã€Œå®ƒå€‘ã€çš„è©±ï¼Œã€Œå®ƒå€‘ã€åˆæ˜¯ä»€éº¼å‘¢ï¼Ÿå¯«é•·ä¸€é»žå¥½äº†ã€‚
-#: ../libpurple/util.c:2707
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13669,84 +13884,84 @@ msgstr ""
 msgstr ""
 "åœ¨è§£æžæ‚¨çš„%sæ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚æª”æ¡ˆå…§çš„è³‡æ–™ä¸¦æ²’æœ‰è¢«è®€å…¥ï¼ŒåŒæ™‚èˆŠæª”æ¡ˆå·²ç§»è‡³ %s~ã€‚"
 
-#: ../libpurple/util.c:3207
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "è¨ˆç®—ä¸..."
 
-#: ../libpurple/util.c:3210
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "æœªçŸ¥ã€‚"
 
-#: ../libpurple/util.c:3236
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d ç§’"
 msgstr[1] "%d ç§’"
 
-#: ../libpurple/util.c:3248
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d æ—¥"
 msgstr[1] "%d æ—¥"
 
-#: ../libpurple/util.c:3256
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d å°æ™‚"
 msgstr[1] "%s %d å°æ™‚"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d å°æ™‚"
 msgstr[1] "%d å°æ™‚"
 
-#: ../libpurple/util.c:3270
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d åˆ†"
 msgstr[1] "%s %d åˆ†"
 
-#: ../libpurple/util.c:3276
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d åˆ†"
 msgstr[1] "%d åˆ†"
 
-#: ../libpurple/util.c:3536
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "ç„¡æ³•æ‰“é–‹ %sï¼šé‡æ–°å°Žå‘çš„æ¬¡æ•¸è¶…éŽäº†ä¸Šé™"
 
-#: ../libpurple/util.c:3573 ../libpurple/util.c:3869
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "ç„¡æ³•é€£ç·šåˆ°ã€Œ%sã€"
 
-#: ../libpurple/util.c:3696
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "ç„¡æ³•ç‚ºè®€å…¥ã€Œ%sã€å–å¾—è¶³å¤ çš„è¨˜æ†¶é«”ï¼Œç¶²ç«™çš„ä¼ºæœå™¨å¯èƒ½æ‡·æœ‰æƒ¡æ„ã€‚"
 
-#: ../libpurple/util.c:3731
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "è®€å…¥ %s é€”ä¸ç™¼ç”ŸéŒ¯èª¤ï¼š%s"
 
-#: ../libpurple/util.c:3762
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "å¯«å…¥ %s é€”ä¸ç™¼ç”Ÿäº†éŒ¯èª¤ï¼š%s"
 
-#: ../libpurple/util.c:3787
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "ç„¡æ³•é€£ç·šåˆ° %sï¼š%s"
@@ -13773,75 +13988,75 @@ msgstr "ç³»çµ±åŒ£æ–¹å‘"
 msgstr "ç³»çµ±åŒ£æ–¹å‘"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "ç™»å…¥é¸é …"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "é€šè¨Šå”å®š(_T)ï¼š"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "å¸³è™Ÿ(_N)ï¼š"
 
 # NOTE Debian è¯ã€Œlocalã€ç‚ºã€Œæœ¬åœ°ç«¯ã€ï¼Œã€Œæœ¬æ©Ÿã€æ˜¯Windowsè¯æ³•ï¼Œä½†åœ¨é€™è£å¥½åƒæ¯”è¼ƒå¦¥ç•¶
 # XXX
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "å¸³è™Ÿåˆ¥åï¼ˆåªåœ¨æœ¬æ©Ÿç”Ÿæ•ˆï¼‰(_L)ï¼š"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "è¨˜ä½å¯†ç¢¼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "ä½¿ç”¨è€…è‡ªå®šé¸é …"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "æ–°éƒµä»¶é€šçŸ¥(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "ä½¿ç”¨ä¸‹åˆ—å¥½å‹åœ–ç¤º(_I)ï¼š"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "%s é¸é …"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "ä½¿ç”¨ GNOME çš„ä»£ç†ä¼ºæœå™¨è¨å®š"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "ä½¿ç”¨å…¨åŸŸçš„ä»£ç†ä¼ºæœå™¨è¨å®š"
 
 # NOTE å¯ä»¥æœ‰ä»£ç†ä¼ºæœå™¨ä½†æ¯‹é ˆç”¨
 # NOTE é¦™æ¸¯æ™®éç”¨ã€Œæ¯‹é ˆã€ï¼Œä½†è¬›åœ‹èªžã€Œæ¯‹é ˆã€æœƒä¸é€šé †ï¼Œã€Œä¸ä½¿ç”¨ã€è¼ƒå¥½
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "ä¸ä½¿ç”¨ä»£ç†ä¼ºæœå™¨"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "ä½¿ç”¨ç’°å¢ƒè®Šæ•¸è¨å®š"
 
@@ -13850,72 +14065,72 @@ msgstr "ä½¿ç”¨ç’°å¢ƒè®Šæ•¸è¨å®š"
 #. 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:1006
+#: ../pidgin/gtkaccount.c:1009
 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:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "é´›é´¦è´è¶ä¹Ÿçœ‹å¾—è¦‹è€¶"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "ä»£ç†ä¼ºæœå™¨é¸é …"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "ä»£ç†ä¼ºæœå™¨åž‹æ…‹(_T)ï¼š"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1228
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "ä¸»æ©Ÿä½å€(_H)ï¼š"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1246
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "é€šè¨ŠåŸ (_P)ï¼š"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "ä½¿ç”¨è€…(_U)ï¼š"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "å¯†ç¢¼(_S)ï¼š"
 
-#: ../pidgin/gtkaccount.c:1195
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
 msgstr "ç„¡æ³•å„²å˜æ–°å¸³è™Ÿ"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr "å·²æœ‰ä¸€å€‹ä¹ŽåˆæŒ‡å®šæ¢ä»¶çš„å¸³è™Ÿã€‚"
 
-#: ../pidgin/gtkaccount.c:1474
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "æ–°å¢žå¸³è™Ÿ"
 
-#: ../pidgin/gtkaccount.c:1493
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "åŸºæœ¬è¨å®š(_B)"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr "åœ¨ä¼ºæœå™¨ä¸Šå»ºç«‹é€™å€‹æ–°å¸³è™Ÿ"
 
-#: ../pidgin/gtkaccount.c:1516
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "é€²éšŽè¨å®š(_A)"
 
-#: ../pidgin/gtkaccount.c:1974 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "å•Ÿå‹•"
 
-#: ../pidgin/gtkaccount.c:2002
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "é€šè¨Šå”å®š"
 
-#: ../pidgin/gtkaccount.c:2202
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13937,7 +14152,7 @@ msgstr ""
 "æ‚¨å¦‚æžœå¸Œæœ›æ–°å¢žã€ä¿®æ”¹æˆ–åˆªé™¤å¸³è™Ÿï¼Œåªè¦é€éŽå¥½å‹æ¸…å–®ä¸Šçš„ã€Œå¸³è™Ÿ->æ–°å¢žï¼ç·¨è¼¯ã€æŒ‡"
 "ä»¤ï¼Œå³å¯è¿”å›žé€™å€‹ç•«é¢ã€‚"
 
-#: ../pidgin/gtkblist.c:524
+#: ../pidgin/gtkblist.c:543
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13945,7 +14160,7 @@ msgstr[1] "æ‚¨ç›®å‰æœ‰ %d å€‹ç¨±ç‚ºã€Œ%
 msgstr[0] "æ‚¨ç›®å‰æœ‰ %d å€‹ç¨±ç‚ºã€Œ%sã€çš„å¥½å‹ï¼Œæ‚¨è¦æŠŠé€™å€‹å¥½å‹åˆä½µå—Žï¼Ÿ"
 msgstr[1] "æ‚¨ç›®å‰æœ‰ %d å€‹ç¨±ç‚ºã€Œ%sã€çš„å¥½å‹ï¼Œæ‚¨è¦æŠŠé€™äº›å¥½å‹åˆä½µå—Žï¼Ÿ"
 
-#: ../pidgin/gtkblist.c:525
+#: ../pidgin/gtkblist.c:544
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -13954,260 +14169,260 @@ msgstr ""
 "åˆä½µå¾Œï¼Œé€™äº›å¥½å‹åœ¨å¥½å‹æ¸…å–®å°‡åªå‡ºç¾ä¸€æ¬¡ï¼Œé€šè¨Šæ™‚ä¹Ÿæœƒå…±ç”¨ä¸€å€‹äº¤è«‡è¦–çª—ã€‚å¦‚æžœå¸Œæœ›"
 "æŠŠé€™äº›å¥½å‹å†æ¬¡åˆ†é–‹ï¼Œåœ¨å¥½å‹æ¸…å–®ä¸ä»¥æ»‘é¼ å³éµé»žæ“Šå¥½å‹åç¨±ï¼Œå†é¸æ“‡ã€Œå±•é–‹ã€å³å¯ã€‚"
 
-#: ../pidgin/gtkblist.c:527
+#: ../pidgin/gtkblist.c:546
 msgid "_Merge"
 msgstr "åˆä½µ(_M)"
 
-#: ../pidgin/gtkblist.c:945
+#: ../pidgin/gtkblist.c:961
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "è«‹è¼¸å…¥é—œæ–¼æ‚¨æ‰€æƒ³åŠ å…¥å¥½å‹æ¸…å–®çš„èŠå¤©å®¤çš„é©ç•¶è³‡è¨Šã€‚\n"
 
-#: ../pidgin/gtkblist.c:956 ../pidgin/gtkblist.c:6242
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "å¸³è™Ÿ(_A)ï¼š"
 
-#: ../pidgin/gtkblist.c:1245 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "å°éŽ–(_B)"
 
-#: ../pidgin/gtkblist.c:1245
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "è§£é™¤å°éŽ–(_B)"
 
-#: ../pidgin/gtkblist.c:1288
+#: ../pidgin/gtkblist.c:1304
 msgid "Move to"
 msgstr "ç§»è‡³"
 
-#: ../pidgin/gtkblist.c:1328
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "å–å¾—è³‡è¨Š(_I)"
 
-#: ../pidgin/gtkblist.c:1331 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "å³æ™‚è¨Šæ¯(_M)"
 
-#: ../pidgin/gtkblist.c:1337
+#: ../pidgin/gtkblist.c:1353
 msgid "_Send File..."
 msgstr "å‚³é€æª”æ¡ˆ(_S)..."
 
-#: ../pidgin/gtkblist.c:1344
+#: ../pidgin/gtkblist.c:1360
 msgid "Add Buddy _Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰(_P)..."
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkblist.c:1353
-#: ../pidgin/gtkblist.c:1468 ../pidgin/gtkblist.c:1491
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "è§€çœ‹æ—¥èªŒ(_L)"
 
-#: ../pidgin/gtkblist.c:1359
+#: ../pidgin/gtkblist.c:1375
 msgid "Hide when offline"
 msgstr "é›¢ç·šæ™‚éš±è—"
 
-#: ../pidgin/gtkblist.c:1359
+#: ../pidgin/gtkblist.c:1375
 msgid "Show when offline"
 msgstr "é›¢ç·šæ™‚é¡¯ç¤º"
 
-#: ../pidgin/gtkblist.c:1373 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1476 ../pidgin/gtkblist.c:1497
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "åˆ¥å(_A)..."
 
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1384
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkblist.c:1499
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "ç§»é™¤(_R)"
 
-#: ../pidgin/gtkblist.c:1434
+#: ../pidgin/gtkblist.c:1450
 msgid "Add _Buddy..."
 msgstr "æ–°å¢žå¥½å‹(_B)..."
 
-#: ../pidgin/gtkblist.c:1437
+#: ../pidgin/gtkblist.c:1453
 msgid "Add C_hat..."
 msgstr "æ–°å¢žèŠå¤©å®¤(_H)..."
 
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "åˆªé™¤ç¾¤çµ„(_D)"
 
-#: ../pidgin/gtkblist.c:1442
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "é‡å‘½å(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1462 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "åŠ å…¥(_J)"
 
-#: ../pidgin/gtkblist.c:1464
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "è‡ªå‹•åŠ å…¥"
 
 # NOTE clarified by rekkanoryo on 20070920 in #pidgin:
 # NOTE (20æ™‚19åˆ†49ç§’) wing: another question... what exactly does "Persistent" in gtkblist.c:1466 refer to?
 # NOTE (20æ™‚37åˆ†09ç§’) rekkanoryo: wing: if you select that option, then close the chat, you don't actually leave.  History builds, and when you double-click the chat in the buddy list again, it opens complete with all the history
-#: ../pidgin/gtkblist.c:1466
+#: ../pidgin/gtkblist.c:1482
 msgid "Persistent"
 msgstr "ä¿æŒé€£ç·š"
 
-#: ../pidgin/gtkblist.c:1504 ../pidgin/gtkblist.c:1527
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "æ”¶èµ·(_C)"
 
-#: ../pidgin/gtkblist.c:1532
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "å±•é–‹(_E)"
 
-#: ../pidgin/gtkblist.c:1783 ../pidgin/gtkblist.c:1795
-#: ../pidgin/gtkblist.c:4929 ../pidgin/gtkblist.c:4942
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
 msgid "/Tools/Mute Sounds"
 msgstr "/å·¥å…·/éœéŸ³"
 
 # XXX æš«è¯
-#: ../pidgin/gtkblist.c:2255 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "æ‚¨ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›æ‚¨æ–°å¢žå“ªå€‹å¥½å‹çš„é€šè¨Šå”å®šã€‚"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/å¥½å‹(_B)"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/å¥½å‹/æ–°å³æ™‚è¨Šæ¯(_M)"
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/å¥½å‹/åŠ å…¥èŠå¤©å®¤(_C)"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/å¥½å‹/å–å¾—ä½¿ç”¨è€…è³‡è¨Š(_I)..."
 
 #  NOTE æ¤è™•è¯ã€Œè®€å–ã€ä¼¼ä¹Žè¼ƒã€Œå–å¾—ã€å¥½ä¸€é»ž
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/å¥½å‹/è®€å–ä½¿ç”¨è€…æ—¥èªŒ(_L)..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3109
 msgid "/Buddies/Sh_ow"
 msgstr "/å¥½å‹/é¡¯ç¤º(_O)"
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/å¥½å‹/é¡¯ç¤º/é›¢ç·šå¥½å‹(_O)"
 
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/å¥½å‹/é¡¯ç¤º/ç©ºç™½ç¾¤çµ„(_E)"
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/å¥½å‹/é¡¯ç¤º/å¥½å‹ç´°ç¯€(_D)"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/å¥½å‹/é¡¯ç¤º/é–’ç½®æ™‚é–“(_T)"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/å¥½å‹/é¡¯ç¤º/é€šè¨Šå”å®šåœ–ç¤º(_P)"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/å¥½å‹/å¥½å‹æ¸…å–®æŽ’åº(_S)"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/å¥½å‹/æ–°å¢žå¥½å‹(_A)..."
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/å¥½å‹/æ–°å¢žèŠå¤©å®¤(_H)..."
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/å¥½å‹/æ–°å¢žç¾¤çµ„(_G)..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/å¥½å‹/çµæŸç¨‹å¼(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/å¸³è™Ÿ(_A)"
 
-#: ../pidgin/gtkblist.c:3089 ../pidgin/gtkblist.c:6943
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
 msgid "/Accounts/Manage"
 msgstr "/å¸³è™Ÿ/ç®¡ç†"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "å·¥å…·(_T)"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/å·¥å…·/å¥½å‹ç‹€æ…‹æ•æ‰(_P)"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
 msgstr "/å·¥å…·/æ†‘è‰(_C)"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/å·¥å…·/æ¨¡çµ„(_G)"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/å·¥å…·/åå¥½è¨å®š(_E)"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/å·¥å…·/éš±ç§è¨å®š(_I)"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/å·¥å…·/æª”æ¡ˆå‚³è¼¸(_F)"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/å·¥å…·/èŠå¤©å®¤æ¸…å–®(_O)"
 
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/å·¥å…·/ç³»çµ±æ—¥èªŒ(_L)"
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/å·¥å…·/éœéŸ³(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/èªªæ˜Ž(_H)"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/èªªæ˜Ž/ç·šä¸Šèªªæ˜Ž(_H)"
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/èªªæ˜Ž/é™¤éŒ¯è¦–çª—(_D)"
 
-#: ../pidgin/gtkblist.c:3109 ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/èªªæ˜Ž/é—œæ–¼(_A)"
 
-#: ../pidgin/gtkblist.c:3140
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14216,79 +14431,79 @@ msgstr ""
 "\n"
 "<b>å¸³è™Ÿï¼š</b>%s"
 
-#: ../pidgin/gtkblist.c:3218
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "å¥½å‹åˆ¥å"
 
-#: ../pidgin/gtkblist.c:3247
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "å·²ç™»å…¥"
 
-#: ../pidgin/gtkblist.c:3293
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "ä¸Šæ¬¡ç™»å…¥"
 
 # XXXã€ŒSpookyã€ä¸€èˆ¬ä¾†èªªåªæ˜¯ã€Œææ€–ã€ï¼Œä¸ä¸€å®šæ˜¯ã€Œå¹½éˆä¼¼çš„ã€æ‰ç®—ã€ŒSpookyã€
-#: ../pidgin/gtkblist.c:3314
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "å¹½éˆä¼¼çš„"
 
-#: ../pidgin/gtkblist.c:3316
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3318
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3657
+#: ../pidgin/gtkblist.c:3693
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "é–’ç½® %d æ—¥ %d å°æ™‚ %02d åˆ†"
 
-#: ../pidgin/gtkblist.c:3659
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "é–’ç½® %d å°æ™‚ %02d åˆ†"
 
-#: ../pidgin/gtkblist.c:3661
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "é–’ç½® %d åˆ†"
 
-#: ../pidgin/gtkblist.c:3814
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/å¥½å‹/æ–°å³æ™‚è¨Šæ¯..."
 
-#: ../pidgin/gtkblist.c:3815 ../pidgin/gtkblist.c:3848
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/å¥½å‹/åŠ å…¥èŠå¤©å®¤(_C)..."
 
-#: ../pidgin/gtkblist.c:3816
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/å¥½å‹/å–å¾—ä½¿ç”¨è€…è³‡è¨Š..."
 
-#: ../pidgin/gtkblist.c:3817
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/å¥½å‹/æ–°å¢žå¥½å‹..."
 
-#: ../pidgin/gtkblist.c:3818 ../pidgin/gtkblist.c:3851
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/å¥½å‹/æ–°å¢žèŠå¤©å®¤..."
 
-#: ../pidgin/gtkblist.c:3819
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/å¥½å‹/æ–°å¢žç¾¤çµ„..."
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/å·¥å…·/éš±ç§è¨å®š"
 
-#: ../pidgin/gtkblist.c:3857
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/å·¥å…·/èŠå¤©å®¤æ¸…å–®"
 
-#: ../pidgin/gtkblist.c:3989 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14296,46 +14511,69 @@ msgstr[1] "%d å€‹ç”± %s ç™¼å‡ºçš„æœªè®€å
 msgstr[0] "%d å€‹ç”± %s ç™¼å‡ºçš„æœªè®€å–è¨Šæ¯\n"
 msgstr[1] "%d å€‹ç”± %s ç™¼å‡ºçš„æœªè®€å–è¨Šæ¯\n"
 
-#: ../pidgin/gtkblist.c:4149
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "ä½¿ç”¨è€…è‡ªå®š"
 
-#: ../pidgin/gtkblist.c:4152
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "ä¾ç…§ç‹€æ…‹"
 
-#: ../pidgin/gtkblist.c:4153
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "ä¾ç…§æ—¥èªŒå¤§å°"
 
-#: ../pidgin/gtkblist.c:4358 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4483
 #, c-format
 msgid "%s disconnected"
 msgstr "%s çµæŸé€£ç·š"
 
-#: ../pidgin/gtkblist.c:4393
+#: ../pidgin/gtkblist.c:4485
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s çµæŸé€£ç·šï¼š%s</span>"
+msgid "%s disabled"
+msgstr "%s å·²è¢«åœç”¨"
 
-#: ../pidgin/gtkblist.c:4545
+#: ../pidgin/gtkblist.c:4489
+msgid "Reconnect"
+msgstr "é‡æ–°é€£ç·š"
+
+#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+msgid "Re-enable"
+msgstr "é‡æ–°å•Ÿå‹•"
+
+#  NOTEã€ŒIgnoreã€åŽŸè¯ã€Œå¿½ç•¥ä½¿ç”¨è€…ã€ï¼Œä½† gtkprefs.c ä¸çš„ã€ŒIgnoreã€
+#  NOTE ä¹ƒã€Œå¿½ç•¥æ ¼å¼ã€çš„æ„æ€ï¼Œæ•…åªèƒ½è¯æˆã€Œå¿½ç•¥ã€
+#: ../pidgin/gtkblist.c:4493 ../pidgin/gtkblist.c:4580
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "å¿½ç•¥"
+
+#: ../pidgin/gtkblist.c:4604
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºæ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
+msgstr[1] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºæ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
+
+#: ../pidgin/gtkblist.c:4831
 msgid "<b>Username:</b>"
 msgstr "<b>ä½¿ç”¨è€…åç¨±ï¼š</b>"
 
-#: ../pidgin/gtkblist.c:4552
+#: ../pidgin/gtkblist.c:4838
 msgid "<b>Password:</b>"
 msgstr "<b>å¯†ç¢¼ï¼š</b>"
 
-#: ../pidgin/gtkblist.c:4563
+#: ../pidgin/gtkblist.c:4849
 msgid "_Login"
 msgstr "ç™»å…¥(_L)"
 
-#: ../pidgin/gtkblist.c:4646
+#: ../pidgin/gtkblist.c:4934
 msgid "/Accounts"
 msgstr "/å¸³è™Ÿ"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4660
+#: ../pidgin/gtkblist.c:4948
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14353,27 +14591,27 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4923
+#: ../pidgin/gtkblist.c:5219
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/å¥½å‹/é¡¯ç¤º/é›¢ç·šå¥½å‹"
 
-#: ../pidgin/gtkblist.c:4926
+#: ../pidgin/gtkblist.c:5222
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/å¥½å‹/é¡¯ç¤º/ç©ºç¾¤çµ„"
 
-#: ../pidgin/gtkblist.c:4932
+#: ../pidgin/gtkblist.c:5228
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/å¥½å‹/é¡¯ç¤º/å¥½å‹ç´°ç¯€"
 
-#: ../pidgin/gtkblist.c:4935
+#: ../pidgin/gtkblist.c:5231
 msgid "/Buddies/Show/Idle Times"
 msgstr "/å¥½å‹/é¡¯ç¤º/é–’ç½®æ™‚é–“"
 
-#: ../pidgin/gtkblist.c:4938
+#: ../pidgin/gtkblist.c:5234
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/å¥½å‹/é¡¯ç¤º/é€šè¨Šå”å®šåœ–ç¤º"
 
-#: ../pidgin/gtkblist.c:5850
+#: ../pidgin/gtkblist.c:6166
 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. "
@@ -14383,100 +14621,89 @@ msgstr ""
 "åœ¨å¥½å‹æ¸…å–®ä¸é¡¯ç¤ºã€‚\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5873
+#: ../pidgin/gtkblist.c:6189
 msgid "A_ccount:"
 msgstr "å¸³è™Ÿ(_C)ï¼š"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5885
+#: ../pidgin/gtkblist.c:6201
 msgid "_Screen name:"
 msgstr "å¸³è™Ÿ(_S)ï¼š"
 
-#: ../pidgin/gtkblist.c:5907 ../pidgin/gtkblist.c:6263
+#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
 msgid "A_lias:"
 msgstr "åˆ¥å(_L)ï¼š"
 
-#: ../pidgin/gtkblist.c:6175
+#: ../pidgin/gtkblist.c:6491
 msgid "This protocol does not support chat rooms."
 msgstr "é€™å€‹é€šè¨Šå”å®šä¸æ”¯æ´èŠå¤©å®¤ã€‚"
 
-#: ../pidgin/gtkblist.c:6191
+#: ../pidgin/gtkblist.c:6507
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "æ‚¨ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›æ‚¨åŠ å…¥èŠå¤©å®¤çš„é€šè¨Šå”å®šã€‚"
 
-#: ../pidgin/gtkblist.c:6232
+#: ../pidgin/gtkblist.c:6550
 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:6291
+#: ../pidgin/gtkblist.c:6609
 msgid "Autojoin when account becomes online."
 msgstr "å¸³è™Ÿä¸Šç·šå¾Œéš¨å³è‡ªå‹•åŠ å…¥ã€‚"
 
-#: ../pidgin/gtkblist.c:6292
+#: ../pidgin/gtkblist.c:6610
 msgid "Hide chat when the window is closed."
 msgstr "é—œé–‰è¦–çª—æ™‚åªå°‡èŠå¤©éš±è—ã€‚"
 
-#: ../pidgin/gtkblist.c:6318
+#: ../pidgin/gtkblist.c:6636
 msgid "Please enter the name of the group to be added."
 msgstr "è«‹çµ¦æ‚¨æ–°å¢žçš„ç¾¤çµ„è¼¸å…¥åç¨±ã€‚"
 
 # XXX
-#: ../pidgin/gtkblist.c:6963
+#: ../pidgin/gtkblist.c:7282
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/å¸³è™Ÿ/"
 
-#: ../pidgin/gtkblist.c:6987
+#: ../pidgin/gtkblist.c:7306
 msgid "_Edit Account"
 msgstr "ç·¨è¼¯å¸³è™Ÿ(_E)"
 
 #  NOTE é€™ä¸æ˜¯ã€Œä¸å…è¨±ã€è€Œæ˜¯ã€Œæ²’æœ‰ã€ï¼Œå°¤å…¶æ˜¯åœ¨æ–°çš„ã€Œæ¨¡çµ„ç›¸é—œæŒ‡ä»¤ã€æ¸…å–®ï¼Œ
 #  NOTE è¯æˆã€Œä¸å…è¨±ã€æœƒéžå¸¸æ€ª
-#: ../pidgin/gtkblist.c:7000 ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "æ²’æœ‰ç›¸é—œæŒ‡ä»¤"
 
 # #NOTE å’Œä¸‹ä¸€å€‹ã€ŒEnable Accountã€å°æ‡‰ã€‚
-#: ../pidgin/gtkblist.c:7008
+#: ../pidgin/gtkblist.c:7327
 msgid "_Disable"
 msgstr "åœç”¨å¸³è™Ÿ(_D)"
 
-#: ../pidgin/gtkblist.c:7020
+#: ../pidgin/gtkblist.c:7339
 msgid "Enable Account"
 msgstr "å•Ÿå‹•å¸³è™Ÿ"
 
 # XXX
-#: ../pidgin/gtkblist.c:7026
+#: ../pidgin/gtkblist.c:7345
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/å¸³è™Ÿ/å•Ÿå‹•å¸³è™Ÿ"
 
-#: ../pidgin/gtkblist.c:7075
+#: ../pidgin/gtkblist.c:7394
 msgid "/Tools"
 msgstr "/å·¥å…·"
 
-#: ../pidgin/gtkblist.c:7145
+#: ../pidgin/gtkblist.c:7464
 msgid "/Buddies/Sort Buddies"
 msgstr "/å¥½å‹/å¥½å‹æ¸…å–®æŽ’åº"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
 msgstr "SSL ä¼ºæœå™¨"
 
-#: ../pidgin/gtkconn.c:181
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"åœ¨æ‚¨æ›´æ£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼Œ%s å°‡ä¸æœƒå†è©¦è‘—é‡æ–°é€£ç·šã€‚"
-
 #: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "æœªçŸ¥çš„æŒ‡ä»¤"
@@ -14506,8 +14733,8 @@ msgstr "å¥½å‹(_B)ï¼š"
 msgid "_Buddy:"
 msgstr "å¥½å‹(_B)ï¼š"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "è¨Šæ¯(_M)ï¼š"
 
@@ -14520,11 +14747,11 @@ msgstr "å„²å˜èŠå¤©å…§å®¹"
 msgid "Save Conversation"
 msgstr "å„²å˜èŠå¤©å…§å®¹"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "æœå°‹"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "æœå°‹(_S)ï¼š"
 
@@ -14532,12 +14759,6 @@ msgstr "å–æ¶ˆå¿½ç•¥ä½¿ç”¨è€…"
 msgid "Un-Ignore"
 msgstr "å–æ¶ˆå¿½ç•¥ä½¿ç”¨è€…"
 
-#  NOTEã€ŒIgnoreã€åŽŸè¯ã€Œå¿½ç•¥ä½¿ç”¨è€…ã€ï¼Œä½† gtkprefs.c ä¸çš„ã€ŒIgnoreã€
-#  NOTE ä¹ƒã€Œå¿½ç•¥æ ¼å¼ã€çš„æ„æ€ï¼Œæ•…åªèƒ½è¯æˆã€Œå¿½ç•¥ã€
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "å¿½ç•¥"
-
 #: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "å–å¾—é›¢é–‹è¨Šæ¯"
@@ -14677,11 +14898,11 @@ msgstr "/é¸é …/é¡¯ç¤ºæ™‚é–“æˆ³è¨˜(_M)"
 msgid "/Options/Show Ti_mestamps"
 msgstr "/é¸é …/é¡¯ç¤ºæ™‚é–“æˆ³è¨˜(_M)"
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/äº¤è«‡/æ›´å¤š"
 
-#: ../pidgin/gtkconv.c:3187
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/é¸é …"
 
@@ -14690,243 +14911,243 @@ msgstr "/é¸é …"
 #. 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:3222 ../pidgin/gtkconv.c:3254
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/äº¤è«‡"
 
-#: ../pidgin/gtkconv.c:3262
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/äº¤è«‡/è§€çœ‹æ·å²è¨˜éŒ„"
 
-#: ../pidgin/gtkconv.c:3268
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/äº¤è«‡/å‚³é€æª”æ¡ˆ..."
 
-#: ../pidgin/gtkconv.c:3272
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/äº¤è«‡/æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰..."
 
-#: ../pidgin/gtkconv.c:3278
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/äº¤è«‡/å–å¾—è³‡è¨Š"
 
-#: ../pidgin/gtkconv.c:3282
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/äº¤è«‡/é‚€è«‹..."
 
-#: ../pidgin/gtkconv.c:3288
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/äº¤è«‡/åˆ¥å..."
 
-#: ../pidgin/gtkconv.c:3292
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/äº¤è«‡/å°éŽ–..."
 
-#: ../pidgin/gtkconv.c:3296
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/äº¤è«‡/è§£é™¤å°éŽ–..."
 
-#: ../pidgin/gtkconv.c:3300
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/äº¤è«‡/æ–°å¢ž..."
 
-#: ../pidgin/gtkconv.c:3304
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/äº¤è«‡/ç§»é™¤..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/äº¤è«‡/æ’å…¥é€£çµ..."
 
-#: ../pidgin/gtkconv.c:3314
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/äº¤è«‡/æ’å…¥å½±åƒ..."
 
-#: ../pidgin/gtkconv.c:3320
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/é¸é …/é–‹å§‹è¨˜éŒ„æ—¥èªŒ"
 
-#: ../pidgin/gtkconv.c:3323
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/é¸é …/é–‹å•ŸéŸ³æ•ˆ"
 
-#: ../pidgin/gtkconv.c:3336
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/é¸é …/é¡¯ç¤ºæ ¼å¼å·¥å…·åˆ—"
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/é¸é …/é¡¯ç¤ºæ™‚é–“æˆ³è¨˜"
 
-#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "å°æ–¹æ£åœ¨è¼¸å…¥..."
 
-#: ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "å°æ–¹è¼¸å…¥äº†ä¸€äº›æ±è¥¿ï¼Œä¸éŽæš«åœäº†"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8181
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
 msgid "S_end To"
 msgstr "å‚³é€åˆ°(_E)"
 
-#: ../pidgin/gtkconv.c:4357
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "å‚³é€(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4470
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "æ²’æœ‰äººåœ¨é€™å€‹æˆ¿é–“"
 
-#: ../pidgin/gtkconv.c:5844 ../pidgin/gtkconv.c:5965
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d å€‹äººåœ¨é€™å€‹æˆ¿é–“"
 msgstr[1] "%d å€‹äººåœ¨é€™å€‹æˆ¿é–“"
 
-#: ../pidgin/gtkconv.c:6572 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "è¼¸å…¥ä¸"
 
-#: ../pidgin/gtkconv.c:6576
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "åœæ¢è¼¸å…¥"
 
-#: ../pidgin/gtkconv.c:6579
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "æš±ç¨±è¢«æåŠ"
 
-#: ../pidgin/gtkconv.c:6582 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "æœªè®€è¨Šæ¯"
 
-#: ../pidgin/gtkconv.c:6588
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "æ–°äº‹ä»¶"
 
 # XXX
-#: ../pidgin/gtkconv.c:7700
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clearï¼šæ¸…ç©ºæ‰€æœ‰äº¤è«‡çš„å›žæ²ç·©è¡å€"
 
-#: ../pidgin/gtkconv.c:7863
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "ç¢ºèªé—œé–‰"
 
-#: ../pidgin/gtkconv.c:7895
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "æ‚¨é‚„æœ‰æœªè®€å–çš„è¨Šæ¯ã€‚æ‚¨ç¢ºå®šè¦é—œé–‰é€™å€‹è¦–çª—å—Žï¼Ÿ"
 
-#: ../pidgin/gtkconv.c:8514
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "é—œé–‰å…¶ä»–åˆ†é "
 
-#: ../pidgin/gtkconv.c:8520
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "é—œé–‰æ‰€æœ‰åˆ†é "
 
-#: ../pidgin/gtkconv.c:8528
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "åˆ†é›¢é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:8534
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "é—œé–‰é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:9031
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "é—œé–‰äº¤è«‡"
 
-#: ../pidgin/gtkconv.c:9633
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "ä¸Šä¸€å€‹é–‹å•Ÿçš„è¦–çª—"
 
-#: ../pidgin/gtkconv.c:9635
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "ä»¥ä¸åŒçš„è¦–çª—é¡¯ç¤ºå³æ™‚è¨Šæ¯å’ŒèŠå¤©"
 
-#: ../pidgin/gtkconv.c:9637 ../pidgin/gtkprefs.c:1417
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "æ–°è¦–çª—"
 
-#: ../pidgin/gtkconv.c:9639
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "ä¾ç¾¤çµ„"
 
-#: ../pidgin/gtkconv.c:9641
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "ä¾å¸³è™Ÿ"
 
 #  NOTEã€Œé™¤éŒ¯æ—¥èªŒã€å¾ˆæ€ªï¼Œã€Œé™¤éŒ¯ç´€éŒ„ã€è¼ƒé †å£ï¼Œè€Œä¸”å·²ç¶“æœ‰äººç”¨
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "å„²å˜é™¤éŒ¯ç´€éŒ„"
 
 # NOTE å¯èƒ½æ˜¯æŒ‡ã€Œåå‘é¸å–ã€
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "åå‘"
 
 # XXX TODO æˆ‘éžå¸¸è¨ŽåŽæŠŠã€ŒHighlightã€è¯æˆã€Œé«˜äº®åº¦ã€ï¼Œä½†è¯æ–‡å¯ä»¥æ”¹é€² - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "æ¨™ç¤ºåŒ¹é…å—ä¸²"
 
 #  NOTE é™¤éŒ¯è¦–çª—çš„å·¥å…·åˆ—çš„å¿«å–é¸å–®çš„æŒ‡ä»¤ï¼ŒæŒ‡ã€Œå·¥å…·åˆ—çš„æŒ‰ç´ä»¥åœ–ç¤ºæ¨™ç¤ºã€ï¼Œä¸‹äºŒåŒ
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "é¡¯ç¤ºåœ–ç¤º(_I)"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "é¡¯ç¤ºæ–‡å—(_T)"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "é¡¯ç¤ºåœ–ç¤ºå’Œæ–‡å—(_B)"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "éŽæ¿¾å™¨"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "æŒ‰å³éµä»¥é¡¯ç¤ºæ›´å¤šé¸é …ã€‚"
 
 # TODO è¦è¦†æŸ¥ - 20061025
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "éŽæ¿¾ç¨‹åº¦ "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "é¸æ“‡é™¤éŒ¯è¨Šæ¯çš„éŽæ¿¾ç¨‹åº¦ã€‚"
 
 # TODO è¦è¦†æŸ¥ - 20061025
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "å…¨éƒ¨è¨Šæ¯"
 
 # NOTE é€™å€‹ä¸æ˜¯æŒ‡ã€ŒInfoã€ï¼ˆå› ç‚ºå·²ç¶“æœ‰ã€ŒInfoã€ä¸€é …ï¼‰ï¼Œè€Œæ˜¯ä¸€ç¨®æ¯”ã€ŒInfoã€é‚„è¦ä½Žå±¤æ¬¡çš„é™¤éŒ¯è¨Šæ¯ï¼Œæ‡‰æ˜¯æŒ‡ã€ŒDebugã€
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "é–’é›œè¨Šæ¯"
 
 # TODO è¦è¦†æŸ¥ - 20061025
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "è¦å‘Šè¨Šæ¯"
 
 # TODO è¦è¦†æŸ¥ - 20061025
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "éŒ¯èª¤è¨Šæ¯"
 
 # TODO è¦è¦†æŸ¥ - 20061025
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "åš´é‡éŒ¯èª¤è¨Šæ¯"
 
@@ -14941,20 +15162,20 @@ msgstr "ä¸»è¦é–‹ç™¼è€…"
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../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
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "é–‹ç™¼è€…"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "æ”¯æ´"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "æ”¯æ´å…¼å“ç®¡"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "é–‹ç™¼è€…å…¼ç¶²ç«™ç®¡ç†å“¡"
 
@@ -15317,12 +15538,12 @@ msgstr "é˜¿å§†å“ˆæ‹‰æ–‡"
 msgid "Amharic"
 msgstr "é˜¿å§†å“ˆæ‹‰æ–‡"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "é—œæ–¼ %s"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:411
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15343,12 +15564,12 @@ msgstr ""
 "ä½œï¼Œç‰ˆæ¬Šæ¸å…¨éƒ¨è²¢ç»è€…å…±åŒæ‰€æœ‰ï¼Œè²¢ç»è€…èŠ³åè©³åˆ—åœ¨åç‚ºã€ŒCOPYRIGHTã€çš„æª”æ¡ˆå…§ã€‚æœ¬ç¨‹"
 "å¼æ•ä¸æä¾›ä»»ä½•ä¿ç”¨ã€‚<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
+#: ../pidgin/gtkdialogs.c:429
 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:423
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "ç¾ä»»é–‹ç™¼è€…"
 
@@ -15356,96 +15577,100 @@ msgstr "ç¾ä»»é–‹ç™¼è€…"
 # NOTE Luke Schierer èªª:ã€Œé€™äº›äººä¸€å€‹æ˜¯ç˜‹äº†ï¼Œå¦å‰‡ä¸æœƒç‚º gaim è³£åŠ›ã€
 # NOTE æ‰€ä»¥æ£ç¢ºçš„è¯æ–‡æ‡‰æ˜¯ã€Œç˜‹ç™²çš„æ¨¡çµ„ä½œè€…ã€æˆ–è€…ã€Œæ¨¡çµ„çš„ç˜‹ç™²ä½œè€…ã€ä¹‹é¡žâ€¦â€¦
 # NOTE ä¸éŽé€™æ¨£å¥½åƒæœ‰é»žéŽä»½ï¼Œæ‰€ä»¥ç¿»æˆã€Œç‹‚ç†±çš„æ¨¡çµ„ä½œè€…ã€æœƒæ¯”è¼ƒå¥½ :P
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "ç‹‚ç†±çš„æ¨¡çµ„ä½œè€…"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "å‰ä»»é–‹ç™¼è€…"
 
 # NOTE åƒè¦‹ã€ŒCrazy Patch Writerã€æ¢
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
 msgstr "å‰ä»»çš„ç‹‚ç†±æ¨¡çµ„ä½œè€…"
 
 #  NOTE å¯è¯ã€Œç¾Žå·¥äººå“¡ã€ï¼Œä½†é‚£æ˜¯å¾ˆä¿å®ˆçš„è¯æ³•ï¼›Pidgin çš„ Artist æ˜¯åšè¨è¨ˆåœ–ç¤ºã€é‡æ–°æ•´ç†ä»‹é¢ç‰ç‰é€™äº›å¾ˆé›£åšçš„å·¥ä½œçš„äººï¼Œæ‰€ä»¥å¾ˆæ˜Žé¡¯æ˜¯ã€Œè¨è¨ˆå“¡ã€
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "å¹³é¢è¨è¨ˆ"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "ç¾ä»»è¯è€…"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "å‰ä»»è¯è€…"
 
 # NOTE é€™æ˜¯ã€Œé—œæ–¼ Pidginã€è¦–çª—ä¸ï¼Œæœ€å¾Œå‡ºç¾ï¼Œç”¨ä¾†ä½œé™¤éŒ¯ç”¨çš„å„ç¨®è³‡è¨Šï¼Œä¸èƒ½è¯æˆã€Œè¨Šæ¯ã€
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "é™¤éŒ¯å°ˆç”¨è³‡è¨Š"
 
 # NOTE åªèƒ½è¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
-#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
 msgid "_Name"
 msgstr "åç¨±(_N)"
 
-#: ../pidgin/gtkdialogs.c:758 ../pidgin/gtkdialogs.c:897
-#: ../pidgin/gtkdialogs.c:978
+#: ../pidgin/gtkdialogs.c:769
+msgid "Buddy"
+msgstr "å¥½å‹"
+
+#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
 msgid "_Account"
 msgstr "å¸³è™Ÿ(_A)"
 
-#: ../pidgin/gtkdialogs.c:905
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "å–å¾—ä½¿ç”¨è€…è³‡è¨Š"
 
-#: ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:922
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€æƒ³è¦æŸ¥è©¢å°è±¡çš„å¸³è™Ÿã€‚"
 
-#: ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "è§€çœ‹ä½¿ç”¨è€…æ—¥èªŒ"
 
-#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1014
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€æƒ³è¦è®€å–æ—¥èªŒçš„ä½¿ç”¨è€…çš„å¸³è™Ÿæˆ–åˆ¥åã€‚"
 
 # XXX ä¸æ–‡è¯æ–‡ç„¡æ³•åˆ†åˆ¥å‡ºã€ŒAlias Buddyã€å’Œã€ŒAlias Contactã€
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "ç‚ºé€™çµ„å¥½å‹åŠ ä¸Šåˆ¥å"
 
 # XXX ä¸æ–‡è¯æ–‡ç„¡æ³•åˆ†åˆ¥å‡ºã€ŒAlias Buddyã€å’Œã€ŒAlias Contactã€
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
 msgstr "è«‹ç‚ºé€™çµ„å¥½å‹è¼¸å…¥ä¸€å€‹åˆ¥åã€‚"
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "è«‹ç‚º %s è¼¸å…¥ä¸€å€‹åˆ¥å"
 
-#: ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "ç‚ºé€™å€‹å¥½å‹åŠ ä¸Šåˆ¥å"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "çµ¦èŠå¤©å®¤æ”¹åˆ¥å"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
 msgstr "è«‹ç‚ºé€™å€‹èŠå¤©å®¤è¼¸å…¥ä¸€å€‹åˆ¥åã€‚"
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1120
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15461,32 +15686,32 @@ msgstr[1] ""
 "ä½œå—Žï¼Ÿ"
 
 # XXXã€ŒRemove Buddyã€å’Œã€ŒRemove Contactã€åœ¨ä¸æ–‡ç‰ˆPidginç„¡æ³•æžåˆ¥ï¼›å¯èƒ½æœ‰æ”¹é€²çš„ç©ºé–“
-#: ../pidgin/gtkdialogs.c:1113
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "ç§»é™¤é€™çµ„å¥½å‹"
 
 # XXXã€ŒRemove Buddyã€å’Œã€ŒRemove Contactã€åœ¨ä¸æ–‡ç‰ˆPidginç„¡æ³•æžåˆ¥ï¼›å¯èƒ½æœ‰æ”¹é€²çš„ç©ºé–“
-#: ../pidgin/gtkdialogs.c:1116
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "ç§»é™¤è¯çµ¡äºº(_R)"
 
 # TODO è¯æ–‡æœ‰å¾…æ”¹é€² - 20061025
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1162
 #, 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:1154
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "åˆä½µç¾¤çµ„"
 
-#: ../pidgin/gtkdialogs.c:1157
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "åˆä½µç¾¤çµ„(_M)"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15494,42 +15719,42 @@ msgstr ""
 msgstr ""
 "æ‚¨æ£è©¦è‘—å°‡ç¾¤çµ„ %s åŠç›¸é—œçš„æˆå“¡å¾žæ‚¨çš„å¥½å‹æ¸…å–®ä¸ç§»é™¤ã€‚æ‚¨è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-#: ../pidgin/gtkdialogs.c:1210
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "ç§»é™¤ç¾¤çµ„"
 
-#: ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "ç§»é™¤ç¾¤çµ„(_R)"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "æ‚¨æ£è©¦è‘—å°‡ %s  å¾žæ‚¨çš„å¥½å‹æ¸…å–®ä¸ç§»é™¤ã€‚æ‚¨è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
 # XXXã€ŒRemove Buddyã€å’Œã€ŒRemove Contactã€åœ¨ä¸æ–‡ç‰ˆPidginç„¡æ³•æžåˆ¥ï¼›å¯èƒ½æœ‰æ”¹é€²çš„ç©ºé–“
-#: ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "ç§»é™¤é€™å€‹å¥½å‹"
 
 # XXXã€ŒRemove Buddyã€å’Œã€ŒRemove Contactã€åœ¨ä¸æ–‡ç‰ˆPidginç„¡æ³•æžåˆ¥ï¼›å¯èƒ½æœ‰æ”¹é€²çš„ç©ºé–“
-#: ../pidgin/gtkdialogs.c:1252
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "ç§»é™¤é€™å€‹å¥½å‹(_R)"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1288
 #, 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:1276
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "ç§»é™¤èŠå¤©å®¤"
 
-#: ../pidgin/gtkdialogs.c:1279
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "ç§»é™¤èŠå¤©å®¤(_R)"
 
@@ -15655,44 +15880,44 @@ msgstr "æ¢å¾©(_R)"
 msgstr "æ¢å¾©(_R)"
 
 #  NOTE Nautilusè¯ã€Œè²¼ä¸Šæ–‡æœ¬ã€ï¼ŒAbiwordè¯ã€Œæœªæ ¼å¼åŒ–è²¼ä¸Šã€ï¼Œè½ä¾†éƒ½æœ‰äº›æ€ª
-#: ../pidgin/gtkimhtml.c:817
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "è²¼ä¸Šç´”æ–‡å—(_T)"
 
-#: ../pidgin/gtkimhtml.c:834 ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–(_R)"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "é€£çµé¡è‰²"
 
-#: ../pidgin/gtkimhtml.c:1375
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "é¡¯ç¤ºé€£çµæ™‚æ‰€ç”¨çš„é¡è‰²ã€‚"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr "é€£çµé¡è‰²"
 
-#: ../pidgin/gtkimhtml.c:1379
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "ç•¶æ»‘é¼ ç¶“éŽé€£çµæ™‚çš„é€£çµé¡è‰²ã€‚"
 
-#: ../pidgin/gtkimhtml.c:1599
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "è¤‡è£½é›»åéƒµä»¶åœ°å€(_C)"
 
-#: ../pidgin/gtkimhtml.c:1611
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "åœ¨ç€è¦½å™¨ä¸æ‰“é–‹é€£çµ(_O)"
 
-#: ../pidgin/gtkimhtml.c:1621
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "è¤‡è£½é€£çµä½å€(_C)"
 
 # NOTE "Defaulting to PNG" æ˜¯æŒ‡ gaim åœ¨ç„¡è¨ˆå¯æ–½çš„æƒ…æ³ä¸‹ç›²çŒœå½±åƒæ˜¯ PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3371
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15703,7 +15928,7 @@ msgstr ""
 "æš«ä¸”ç•¶æˆ PNG æª”è™•ç†ã€‚"
 
 # NOTE "Defaulting to PNG" æ˜¯æŒ‡ gaim åœ¨ç„¡è¨ˆå¯æ–½çš„æƒ…æ³ä¸‹ç›²çŒœå½±åƒæ˜¯ PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3374
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15713,7 +15938,7 @@ msgstr ""
 "\n"
 "æš«ä¸”ç•¶æˆ PNG æª”è™•ç†ã€‚"
 
-#: ../pidgin/gtkimhtml.c:3403
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15724,7 +15949,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3406
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15735,11 +15960,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3484 ../pidgin/gtkimhtml.c:3496
+#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "å„²å˜å½±åƒ"
 
-#: ../pidgin/gtkimhtml.c:3524
+#: ../pidgin/gtkimhtml.c:3506
 msgid "_Save Image..."
 msgstr "å„²å˜å½±åƒ(_S)..."
 
@@ -15747,181 +15972,181 @@ msgstr "é¸æ“‡å—åž‹"
 msgid "Select Font"
 msgstr "é¸æ“‡å—åž‹"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "è¨å®šæ–‡å—é¡è‰²"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "è¨å®šèƒŒæ™¯é¡è‰²"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "æè¿°(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€è¦æ’å…¥çš„ URL åŠå®ƒçš„æè¿°ï¼Œæè¿°æ˜¯é¸æ“‡æ€§çš„ï¼Œå¯ä¸ç”¨è¼¸å…¥ã€‚"
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€è¦æ’å…¥çš„ URLã€‚"
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "åŠ å…¥é€£çµ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "æ’å…¥(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "ç„¡æ³•å„²å˜å½±åƒï¼š%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "æ’å…¥å½±åƒ"
 
 #  XXX è¯æ–‡ä¸é€šé †
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "é€™å€‹è¡¨æƒ…ä¸»é¡Œä¸å«ä»»ä½•è¡¨æƒ…ã€‚"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "ç¬‘ä¸€å€‹ï¼"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
 msgstr "å—åž‹(_F)"
 
 # XXX æš«è¯
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
 msgstr "å»ºç«‹ç¾¤çµ„"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
 msgstr "è§£é™¤ç¾¤çµ„"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "ç²—é«”"
 
 # NOTEã€ŒItalicã€æœ¬ä¾†æ˜¯æŒ‡æŸç¨‹åº¦ä¸Šæ¨¡ä»¿æ‰‹å¯«ã€ä»¥æ›²ç·šç‚ºä¸»çš„å—åž‹ï¼Œã€Œæ–œé«”ã€å…¶å¯¦æ˜¯èª¤è¯ï¼Œä½†å·²æ ¹æ·±è’‚å›ºï¼Œä¸å¯èƒ½æ”¹æ£
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "æ–œé«”"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "åº•ç·š"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
 msgstr "åˆªé™¤ç·š"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Increase Font Size"
 msgstr "æ”¾å¤§å—é«”"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Decrease Font Size"
 msgstr "ç¸®å°å—é«”"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Font Face"
 msgstr "å—åž‹"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Background Color"
 msgstr "èƒŒæ™¯é¡è‰²"
 
 #  XXX è¯ã€Œæ–‡å—é¡è‰²ã€æœƒå¦è¼ƒå¥½ï¼Ÿ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "å‰æ™¯é¡è‰²"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
 msgstr "æ’å…¥å½±åƒ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "æ’å…¥è¡¨æƒ…"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>ç²—é«”(_B)</b>"
 
 # NOTEã€ŒItalicã€æœ¬ä¾†æ˜¯æŒ‡æŸç¨‹åº¦ä¸Šæ¨¡ä»¿æ‰‹å¯«ã€ä»¥æ›²ç·šç‚ºä¸»çš„å—åž‹ï¼Œã€Œæ–œé«”ã€å…¶å¯¦æ˜¯èª¤è¯ï¼Œä½†å·²æ ¹æ·±è’‚å›ºï¼Œä¸å¯èƒ½æ”¹æ£
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr "<i>æ–œé«”(_I)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>åº•ç·š(_U)</u>"
 
 #  NOTE é€™çœ‹ä¾†æ˜¯ä¸€èˆ¬POæª”çš„è¯æ³•ï¼ˆå°åˆ·è¡“èªžçœ‹ä¾†ä¹Ÿæ²’æœ‰æ—¢æœ‰è¯æ³•ï¼‰
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>åˆªé™¤ç·š</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>æ”¾å¤§(_L)</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "æ£å¸¸(_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>ç¸®å°(_S)</span>"
 
 #. 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:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
 msgstr "å—åž‹(_F)"
 
 #  XXX è¯ã€Œæ–‡å—é¡è‰²ã€æœƒå¦è¼ƒå¥½ï¼Ÿ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "å‰æ™¯é¡è‰²(_C)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "èƒŒæ™¯é¡è‰²(_K)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
 msgstr "å½±åƒ(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "é€£çµ(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
 msgstr "æ©«ç·š(_H)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
+#: ../pidgin/gtkimhtmltoolbar.c:1309
 msgid "_Smile!"
 msgstr "ç¬‘ä¸€å€‹(_S)ï¼"
 
@@ -15995,28 +16220,28 @@ msgstr "å…¨éƒ¨æ—¥èªŒå¤§å°ï¼š"
 msgid "Total log size:"
 msgstr "å…¨éƒ¨æ—¥èªŒå¤§å°ï¼š"
 
-#: ../pidgin/gtklog.c:710
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "æ–¼ %s çš„äº¤è«‡"
 
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "èˆ‡ %s çš„äº¤è«‡"
 
-#: ../pidgin/gtklog.c:810
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "ç³»çµ±æ—¥èªŒ"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %sã€‚åŸ·è¡Œã€Œ%s -hã€ä»¥ç²å¾—æ›´é€²ä¸€æ¥çš„è³‡è¨Šã€‚\n"
 
 #  FIXME
 #  NOTE hard-code äº†ä¸€å€‹ã€ŒPidginã€åœ¨è¯æ–‡è£ï¼Œä½†åˆªæŽ‰æœƒæœ‰é»žå›°é›£ï¼ˆä»¤æ–‡å¥é›£æ˜Žï¼‰ï¼Œæ•…æš«æ™‚ä¿ç•™ï¼Œå¾…æƒ³åˆ°æ€Žæ¨£åˆªæŽ‰æ‰ç®—
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16045,7 +16270,7 @@ msgstr ""
 "  --display=DISPLAY   ä½¿ç”¨æŒ‡å®šçš„ X display\n"
 "  -v, --version       é¡¯ç¤ºç‰ˆæœ¬è¨Šæ¯ä¸¦é›¢é–‹\n"
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16070,48 +16295,48 @@ msgstr ""
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "é–‹å•Ÿæ‰€æœ‰è¨Šæ¯"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">æ‚¨æœ‰éƒµä»¶ï¼</span>"
 
-#: ../pidgin/gtknotify.c:545
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s æœ‰ %d å°æ–°éƒµä»¶ã€‚"
 msgstr[1] "%s æœ‰ %d å°æ–°éƒµä»¶ã€‚"
 
-#: ../pidgin/gtknotify.c:569
+#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d å°æ–°éƒµä»¶ã€‚</b>"
 msgstr[1] "<b>%d å°æ–°éƒµä»¶ã€‚</b>"
 
-#: ../pidgin/gtknotify.c:997
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "ç€è¦½å™¨æŒ‡ä»¤ã€Œ%sã€æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
-#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "ç„¡æ³•é–‹å•Ÿç¶²é "
 
-#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "å•Ÿå‹• \"%s\" æ™‚ç™¼ç”ŸéŒ¯èª¤ï¼š%s"
 
-#: ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "æ‚¨é¸ç”¨äº†ã€Œä½¿ç”¨è€…è‡ªå®šç€è¦½å™¨ã€ï¼Œå»æœªæœ‰è¨å®šæŒ‡ä»¤ã€‚"
@@ -16128,7 +16353,17 @@ msgstr "å¸è¼‰æ¨¡çµ„"
 msgid "Unload Plugins"
 msgstr "å¸è¼‰æ¨¡çµ„"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "ç„¡æ³•å¸è¼‰æ¨¡çµ„"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr "ç›®å‰ç„¡æ³•å¸è¼‰æ¨¡çµ„ï¼Œä½†ç”¨æˆ¶ç«¯ä¸‹æ¬¡å•Ÿå‹•æ™‚æ¨¡çµ„å°‡è¢«åœç”¨ã€‚"
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16139,7 +16374,7 @@ msgstr ""
 "<span weight=\"bold\">ç¶²ç«™ï¼š</span>\t\t%s\n"
 "<span weight=\"bold\">æª”åï¼š</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -16150,11 +16385,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">éŒ¯èª¤: %s\n"
 "æª¢æŸ¥æ¨¡çµ„çš„ç¶²ç«™ä»¥ç²å¾—æ›´æ–°ã€‚</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "è¨å®šæ¨¡çµ„(_U)"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>æ¨¡çµ„æ˜Žç´°</b>"
 
@@ -16163,95 +16398,95 @@ msgstr "é¸æ“‡æª”æ¡ˆ"
 msgstr "é¸æ“‡æª”æ¡ˆ"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "æ•æ‰èª°çš„ç‹€æ…‹"
 
-#: ../pidgin/gtkpounce.c:566
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "å¥½å‹åç¨±(_B)ï¼š"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "ç™»å…¥(_G)"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "ç™»å‡º(_F)"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "é›¢é–‹(_W)"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "è¿”å›ž(_U)"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "é–’ç½®(_I)"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "ä¸å†é–’ç½®(_D)"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "é–‹å§‹è¼¸å…¥(_T)"
 
-#: ../pidgin/gtkpounce.c:614
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "æš«åœè¼¸å…¥(_A)"
 
-#: ../pidgin/gtkpounce.c:616
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "åœæ¢è¼¸å…¥(_Y)"
 
-#: ../pidgin/gtkpounce.c:618
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "é€å‡ºä¸€å€‹è¨Šæ¯(_M)"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "é–‹å•Ÿå³æ™‚è¨Šæ¯è¦–çª—(_N)"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "å½ˆå‡ºé€šçŸ¥(_P)"
 
-#: ../pidgin/gtkpounce.c:665
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "é€å‡ºè¨Šæ¯(_M)"
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "åŸ·è¡ŒæŒ‡ä»¤(_X)"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "æ’æ”¾éŸ³æ•ˆ(_L)"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "ç€è¦½(_E)..."
 
-#: ../pidgin/gtkpounce.c:677
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "ç€è¦½(_O)..."
 
-#: ../pidgin/gtkpounce.c:678
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "é è¦½(_V)"
 
-#: ../pidgin/gtkpounce.c:805
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "åªåœ¨æˆ‘çš„ç‹€æ…‹ä¸ç‚ºã€Œä¸Šç·šã€æ™‚å•Ÿç”¨(_O)"
 
-#: ../pidgin/gtkpounce.c:810
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "é‡è¦†ç™¼ç”Ÿ(_R)"
 
-#: ../pidgin/gtkpounce.c:1253
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "æ•æ‰ç›®æ¨™"
 
@@ -16270,7 +16505,7 @@ msgstr "å®‰è£ä¸»é¡Œæª”"
 msgid "Install Theme"
 msgstr "å®‰è£ä¸»é¡Œæª”"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 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."
@@ -16278,15 +16513,15 @@ msgstr ""
 "åœ¨ä¸‹é¢çš„æ¸…å–®ä¸é¸å–ä¸€å€‹æ‚¨æ‰€æƒ³å–œæ¡çš„è¡¨æƒ…ä¸»é¡Œã€‚æ‚¨å¯ä»¥ç”¨æ‹–æ›³çš„æ–¹å¼å°‡æ–°çš„è¡¨æƒ…ä¸»é¡Œ"
 "å®‰è£åˆ°æ¸…å–®ä¸ã€‚"
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "åœ–ç¤º"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "ç³»çµ±å·¥ä½œåŒ£åœ–ç¤º"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "é¡¯ç¤ºç³»çµ±å·¥ä½œåŒ£åœ–ç¤º(_S)ï¼š"
 
@@ -16294,244 +16529,278 @@ msgstr "æœ‰æœªè®€è¨Šæ¯æ™‚"
 msgid "On unread messages"
 msgstr "æœ‰æœªè®€è¨Šæ¯æ™‚"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "éš±è—å³æ™‚è¨Šæ¯äº¤è«‡è¦–çª—"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "éš±è—æ–°çš„å³æ™‚è¨Šæ¯äº¤è«‡(_H)ï¼š"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "é›¢é–‹æœŸé–“"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "åˆ†é "
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "ä½¿ç”¨åˆ†é è¦–çª—é¡¯ç¤ºå³æ™‚è¨Šæ¯å’ŒèŠå¤©(_T)"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "åœ¨åˆ†é ä¸Šé¡¯ç¤ºé—œé–‰éµ(_U)"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "æ¨™ç±¤ä½ç½®(_P)ï¼š"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "è¦–çª—ä¸Šæ–¹"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "è¦–çª—ä¸‹æ–¹"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "è¦–çª—å·¦å´"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "è¦–çª—å³å´"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "å·¦é‚Šåž‚ç›´"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "å³é‚Šåž‚ç›´"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "æ–°äº¤è«‡(_E)ï¼š"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "é¡¯ç¤ºæ‰€æ”¶è¨Šæ¯çš„æ ¼å¼åŒ–(_F)"
 
 #  TODO è¦è¦†æŸ¥ - acli 20070918
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:999
 msgid "Close IMs immediately when the tab is closed"
 msgstr "é—œé–‰åˆ†é æ™‚éš¨å³é—œé–‰åˆ†é å…§æ‰€æœ‰çš„å³æ™‚é€šè¨Š"
 
 #  TODO è¦è¦†æŸ¥ - acli 20070912
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "é¡¯ç¤ºè©³ç´°è³‡è¨Š(_D)"
 
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "å•Ÿå‹•å¥½å‹åœ–ç¤ºå‹•ç•«(_O)"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "é€šçŸ¥æ‚¨çš„å¥½å‹æ‚¨æ£åœ¨ç™¼è¨Šæ¯çµ¦ä»–å€‘(_N)"
 
-#: ../pidgin/gtkprefs.c:1012
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "æ¨™ç¤ºå‡ºæ‹¼éŒ¯çš„å—(_M)"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "ä½¿ç”¨å¹³æ»‘æ²è»¸"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "æ”¶åˆ°å³æ™‚è¨Šæ¯å¾Œé–ƒå‹•è¦–çª—(_F)"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "æœ€å°åŒ–æ‰€æœ‰æ–°äº¤è«‡è¦–çª—(_Z)"
 
-#: ../pidgin/gtkprefs.c:1025
+#: ../pidgin/gtkprefs.c:1027
 msgid "Font"
 msgstr "å—åž‹"
 
 #  XXX è¦è¦†æŸ¥ - acli 20070614
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
 msgstr "ä½¿ç”¨ä¸»é¡ŒæŒ‡å®šçš„æ–‡ä»¶å—åž‹(_T)"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "ä½¿ç”¨ä¸»é¡ŒæŒ‡å®šçš„å—åž‹(_T)"
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "äº¤è«‡ç”¨çš„å—åž‹(_F)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1045
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "é è¨æ ¼å¼"
 
 # NOTE é€™ä¸æ˜¯èªªæ˜Žæ–‡ï¼Œè€Œæ˜¯æ¨£æœ¬æœ¬èº«ï¼ŒçŽ©æ»äººäº† :P
-#: ../pidgin/gtkprefs.c:1064
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "é€™æ˜¯ä¸€å€‹æ¨£æœ¬ã€‚å‡å¦‚æ‚¨ä½¿ç”¨çš„å”å®šæ”¯æ´æ ¼å¼åŒ–ï¼Œé€å‡ºè¨Šæ¯çš„å¼æ¨£å°‡æœƒé¡žä¼¼é€™æ®µæ–‡å—ã€‚"
 
-#: ../pidgin/gtkprefs.c:1130
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "ç„¡æ³•å•Ÿå‹•ä»£ç†ä¼ºæœå™¨è¨å®šç¨‹å¼ã€‚"
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "ç„¡æ³•å•Ÿå‹•ç€è¦½å™¨è¨å®šç¨‹å¼ã€‚"
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "STUN ä¼ºæœå™¨(_U)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1142
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ä¾‹ï¼šstunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1146
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "è‡ªå‹•åµæ¸¬ IP ä½å€(_A)"
 
-#: ../pidgin/gtkprefs.c:1155
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "å…¬å…±IP (_I)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "è‡ªå®šé€šè¨ŠåŸ ç›£è½ç¯„åœ(_M)"
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "å•Ÿå§‹é€šè¨ŠåŸ (_S)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1197
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "çµæŸé€šè¨ŠåŸ (_E)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "ä»£ç†ä¼ºæœå™¨åŠç€è¦½å™¨"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>æ‰¾ä¸åˆ°ä»£ç†ä¼ºæœå™¨è¨å®šç¨‹å¼ã€‚</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>æ‰¾ä¸åˆ°ç€è¦½å™¨è¨å®šç¨‹å¼ã€‚</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr "è«‹ä½¿ç”¨ GNOME çš„ã€Œåå¥½è¨å®šã€åŠŸèƒ½æ›´æ”¹ä»£ç†ä¼ºæœå™¨æˆ–ç€è¦½å™¨è¨å®šã€‚"
+
+#: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "è¨å®šä»£ç†ä¼ºæœå™¨(_P)"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "è¨å®šç€è¦½å™¨(_B)"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "ä»£ç†ä¼ºæœå™¨"
 
 # NOTE ç†ç”±åŒå‰ï¼Œä¸ç”¨ã€Œæ¯‹é ˆã€ï¼Œæ”¹ç‚ºã€Œä¸ä½¿ç”¨ã€
-#: ../pidgin/gtkprefs.c:1209
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "ä¸ä½¿ç”¨ä»£ç†ä¼ºæœå™¨"
 
-#: ../pidgin/gtkprefs.c:1265
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "ä½¿ç”¨è€…(_U)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "GNOMEé è¨"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1348
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "ä½¿ç”¨è€…è‡ªå®š"
 
-#: ../pidgin/gtkprefs.c:1401
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "é¸æ“‡ç€è¦½å™¨"
 
-#: ../pidgin/gtkprefs.c:1405
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "ç€è¦½å™¨(_B)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "åœ¨ç€è¦½å™¨ä¸æ‰“é–‹é€£çµ(_O)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "ç€è¦½å™¨é è¨"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "æ—¢æœ‰çš„è¦–çª—"
 
-#: ../pidgin/gtkprefs.c:1418
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "æ–°åˆ†é "
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16540,63 +16809,63 @@ msgstr ""
 "ä½¿ç”¨è€…è‡ªå®š(_M)ï¼š\n"
 "(è«‹ä»¥ %s ä»£è¡¨ç¶²å€)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "æ—¥èªŒæ ¼å¼(_F)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "è¨˜éŒ„æ‰€æœ‰å³æ™‚è¨Šæ¯(_I)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "è¨˜éŒ„æ‰€æœ‰èŠå¤©å…§å®¹(_H)"
 
-#: ../pidgin/gtkprefs.c:1481
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "è¨˜éŒ„æ‰€æœ‰ç‹€æ…‹æ”¹è®Šè‡³ç³»çµ±æ—¥èªŒ(_S)"
 
-#: ../pidgin/gtkprefs.c:1627
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "é¸å–éŸ³æ•ˆ"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "æœ€å°è²"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "å†å°è²"
 
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "å°è²"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "å¤§è²"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "å†å¤§è²"
 
-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "æœ€å¤§è²"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "æ’æ”¾æ–¹å¼(_M)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1717
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "å—¶ä¸€è²"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "ç„¡éŸ³æ•ˆ"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16605,82 +16874,82 @@ msgstr ""
 "éŸ³æ•ˆæŒ‡ä»¤(_C)ï¼š\n"
 "(è«‹ä»¥ %s ä»£è¡¨æª”å)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "ç•¶äº¤è«‡å–å¾—è¼¸å…¥ç„¦é»žç™¼å‡ºéŸ³æ•ˆ(_F)"
 
-#: ../pidgin/gtkprefs.c:1761
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "å•Ÿå‹•éŸ³æ•ˆï¼š"
 
-#: ../pidgin/gtkprefs.c:1772
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "éŸ³é‡ï¼š"
 
-#: ../pidgin/gtkprefs.c:1852
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "æ’æ”¾"
 
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "é–’ç½®æ™‚é–“åŸºæº–(_R)"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "ä»¥éµç›¤åŠæ»‘é¼ çš„ä½¿ç”¨ç‚ºåŸºæº–"
 
-#: ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "ä½•æ™‚é€å‡ºè‡ªå‹•å›žæ‡‰ï¼š"
 
-#: ../pidgin/gtkprefs.c:1947
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "ç•¶é›¢é–‹ä¸¦åŒæ™‚é–’ç½®æ™‚"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "è‡ªå‹•é›¢é–‹"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "é–’ç½®æ™‚æ›´æ”¹ç‹€æ…‹(_I)"
 
 # NOTE è¯æ–‡æ›´å‹• by Ambrose
-#: ../pidgin/gtkprefs.c:1959
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "é–’ç½®å¤šå°‘åˆ†é˜æ›´æ”¹ç‹€æ…‹(_M)ï¼š"
 
-#: ../pidgin/gtkprefs.c:1967
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "æ›´æ”¹ç‹€æ…‹ç‚º(_S)ï¼š"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "å•Ÿå‹•æ™‚ç‹€æ…‹"
 
-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "ä½¿ç”¨ä¸Šæ¬¡çµæŸå‰çš„ç‹€æ…‹"
 
-#: ../pidgin/gtkprefs.c:1996
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "å•Ÿå‹•æ™‚å¥—ç”¨çš„ç‹€æ…‹ï¼š"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "ä»‹é¢"
 
-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "è¡¨æƒ…ä¸»é¡Œ"
 
-#: ../pidgin/gtkprefs.c:2043
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "ç€è¦½å™¨"
 
-#: ../pidgin/gtkprefs.c:2047
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "ç‹€æ…‹ï¼é–’ç½®"
 
@@ -16704,104 +16973,104 @@ msgstr "å°éŽ–ä»¥ä¸‹çš„ä½¿ç”¨è€…"
 msgid "Block only the users below"
 msgstr "å°éŽ–ä»¥ä¸‹çš„ä½¿ç”¨è€…"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "éš±ç§è¨å®š"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "éš±ç§è¨å®šå°‡ç«‹åˆ»ç”Ÿæ•ˆã€‚"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "å¸³è™Ÿï¼š"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "è¨±å¯ä½¿ç”¨è€…"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "è¼¸å…¥æ‚¨æ‰€è¨±å¯è¯çµ¡æ‚¨çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "è«‹è¼¸å…¥æ‚¨æ‰€è¨±å¯è¯çµ¡æ‚¨çš„ä½¿ç”¨è€…çš„åç¨±ã€‚"
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "è¨±å¯(_P)"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "è¨±å¯ %s è¯çµ¡æ‚¨ï¼Ÿ"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "æ‚¨ç¢ºå®šè¨±å¯ %s è¯çµ¡æ‚¨å—Žï¼Ÿ"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "æ‹’çµ•ä½¿ç”¨è€…"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "è¼¸å…¥è¢«æ‹’çµ•çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "è«‹è¼¸å…¥è¢«æ‚¨æ‹’çµ•çš„ä½¿ç”¨è€…çš„åç¨±ã€‚"
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "æ‹’çµ• %sï¼Ÿ"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "æ‚¨ç¢ºå®šè¦æ‹’çµ• %sï¼Ÿ"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "å¥—ç”¨"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "é‚£å€‹æª”æ¡ˆå·²ç¶“å˜åœ¨"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "æ‚¨è¦è¦†è“‹å®ƒå—Žï¼Ÿ"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "è¦†å¯«"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "é¸å–æ–°åç¨±"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "é¸æ“‡è³‡æ–™åŒ£..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "èŠå¤©å®¤æ¸…å–®"
 
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "å–å¾—æ¸…å–®(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "æ–°å¢žèŠå¤©å®¤(_A)"
 
@@ -16810,7 +17079,7 @@ msgstr "æ‚¨ç¢ºå®šæ‚¨è¦åˆªé™¤è¢«é¸å–çš
 msgstr "æ‚¨ç¢ºå®šæ‚¨è¦åˆªé™¤è¢«é¸å–çš„ç‹€æ…‹ï¼Ÿ"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "ä½¿ç”¨(_U)"
 
@@ -16819,29 +17088,29 @@ msgstr "ç›®å‰æ¨™é¡Œæ£åœ¨ä½¿ç”¨ä¸ã€‚æ‚
 msgstr "ç›®å‰æ¨™é¡Œæ£åœ¨ä½¿ç”¨ä¸ã€‚æ‚¨å¿…é ˆé¸å–ä¸€å€‹å”¯ä¸€çš„æ¨™é¡Œã€‚"
 
 # TODO - é€™å€‹æœ‰é»žä¸å¦¥ï¼Œä½†æƒ³ä¸åˆ°æ›´å¥½çš„ - 20061123
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "å·®ç•°"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "æ¨™é¡Œ(_T)ï¼š"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "ç‹€æ…‹(_S)ï¼š"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "ç‚ºéƒ¨ä»½å¸³è™Ÿè¨å®šä¸åŒçš„ç‹€æ…‹(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "å„²å˜ä¸¦ä½¿ç”¨(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "ç‹€æ…‹ï¼š%s"
@@ -16850,37 +17119,45 @@ msgstr "ç‰å¾…ç¶²è·¯é€£ç·š..."
 msgid "Waiting for network connection"
 msgstr "ç‰å¾…ç¶²è·¯é€£ç·š..."
 
-#: ../pidgin/gtkutils.c:633
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "æ–°å¢žç‹€æ…‹..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "ç‹€æ…‹æ¸…å–®..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "è¼‰å…¥ %s æ™‚ç™¼ç”Ÿä»¥ä¸‹éŒ¯èª¤ï¼š%s"
 
-#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "è®€å–å½±åƒå¤±æ•—"
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "ç„¡æ³•å‚³é€ç›®éŒ„ %sã€‚"
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s æ²’æœ‰è¾¦æ³•å‚³é€ç›®éŒ„ï¼Œæ‚¨éœ€è¦å€‹åˆ¥å‚³é€ç›®éŒ„å…§çš„æª”æ¡ˆã€‚"
 
-#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
-#: ../pidgin/gtkutils.c:1553
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "æ‚¨æ‹–æ›³äº†ä¸€å€‹å½±åƒ"
 
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1536
 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."
@@ -16888,23 +17165,23 @@ msgstr ""
 "æ‚¨å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç‰æ–¹å¼ï¼Œä¾†å‚³é€å½±åƒæª”"
 "çµ¦é€™å€‹ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "è¨ç‚ºå¥½å‹åœ–ç¤º"
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "å‚³é€å½±åƒæª”"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "æ’å…¥åˆ°è¨Šæ¯"
 
-#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "æ‚¨è¦æŠŠå®ƒè¨ç‚ºé€™å€‹ä½¿ç”¨è€…çš„å¥½å‹åœ–ç¤ºå—Žï¼Ÿ"
 
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16912,7 +17189,7 @@ msgstr ""
 "æ‚¨å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç‰æ–¹å¼ï¼Œä¾†å‚³é€å½±åƒæª”çµ¦é€™å€‹ä½¿ç”¨"
 "è€…ã€‚"
 
-#: ../pidgin/gtkutils.c:1555
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16925,17 +17202,17 @@ msgstr ""
 #. * 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:1614
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "ç„¡æ³•å‚³é€å•Ÿå‹•å™¨"
 
-#: ../pidgin/gtkutils.c:1614
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "æ‚¨æ‹–æ›³äº†ä¸€å€‹å•Ÿå‹•å™¨ï¼›æ‚¨å¤§æ¦‚æƒ³å‚³é€å•Ÿå‹•å™¨è¦å•Ÿå‹•çš„æª”æ¡ˆï¼Œè€Œä¸æ˜¯å•Ÿå‹•å™¨æœ¬èº«ã€‚"
 
-#: ../pidgin/gtkutils.c:2349
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16946,25 +17223,25 @@ msgstr ""
 "<b>æª”æ¡ˆå¤§å°ï¼š</b> %s\n"
 "<b>åœ–åƒå°ºå¯¸ï¼š</b> %dÃ—%d"
 
-#: ../pidgin/gtkutils.c:2645
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' å° %s ä¾†èªªå¤ªå¤§äº†ã€‚è«‹è©¦è©¦å°ä¸€é»žçš„å½±è±¡ã€‚\n"
 
-#: ../pidgin/gtkutils.c:2647
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "åœ–åƒéŒ¯èª¤"
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "ç„¡æ³•è¨å®šåœ–åƒ"
 
-#: ../pidgin/gtkutils.c:2748
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "ç„¡æ³•é–‹å•Ÿæª”æ¡ˆã€Œ%sã€ï¼š%s"
 
-#: ../pidgin/gtkutils.c:2797
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17021,38 +17298,38 @@ msgstr "ç„¡"
 msgid "none"
 msgstr "ç„¡"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "é¡¯ç¤ºçµ±è¨ˆè³‡æ–™"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "ã€Œå›žç”ã€æˆ–ç„¶çŽ‡ï¼š"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "çµ±è¨ˆè¨å®š"
 
 #  NOTE åƒé–± gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "å¥½å‹ä½œå‡ºå›žè¦†çš„æ™‚é–“ä¸Šé™ï¼š"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "åˆ†é˜"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #  NOTE åƒé–± gtk/plugins/cap/README
 #  FIXME ä½†é€™åªèƒ½æ˜¯æš«è¯ï¼Œè¯æ–‡çµ•å°æœ‰å¾…æ”¹é€²
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "ç²¾å¯†åº¦ï¼š"
 
@@ -17062,18 +17339,18 @@ msgstr "ç²¾å¯†åº¦ï¼š"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬æ¨¡çµ„"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -17132,20 +17409,20 @@ msgstr "å€‹åˆ¥å¸³è™Ÿçš„å¾—åˆ†å€¼"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "å¥½å‹å„ªå…ˆæ¬¡åº"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "è®“ä½ è‡ªå®šå„å€‹å¥½å‹ç‹€æ…‹çš„å¾—åˆ†å€¼ã€‚"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -17805,11 +18082,11 @@ msgstr "é‡æ–°è®€å–gtkrcæª”æ¡ˆ"
 msgid "Re-read gtkrc files"
 msgstr "é‡æ–°è®€å–gtkrcæª”æ¡ˆ"
 
-#: ../pidgin/plugins/pidginrc.c:538
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ ä½ˆæ™¯ä¸»é¡Œè¨å®š"
 
-#: ../pidgin/plugins/pidginrc.c:540 ../pidgin/plugins/pidginrc.c:541
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "æä¾›ä¸€èˆ¬ gtkrc è¨å®šçš„å˜å–"
 
@@ -17936,11 +18213,11 @@ msgstr "æœ€å¾Œè¼¸å…¥çš„ä¸€å€‹å—ä¹Ÿé€²è¡
 msgid "Enable replacement of last word on send"
 msgstr "æœ€å¾Œè¼¸å…¥çš„ä¸€å€‹å—ä¹Ÿé€²è¡Œæ–‡å—å–ä»£"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "æ–‡å—å–ä»£"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ä¾ç…§ä½¿ç”¨è€…æ‰€å®šç¾©çš„è¦å‰‡ä¾†å–ä»£é€å‡ºè¨Šæ¯ä¸çš„æ–‡å—ã€‚"
 
@@ -18159,7 +18436,7 @@ msgstr "æä¾› Windows ç‰ˆ Pidgin çš„ç›¸
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "æä¾› Windows ç‰ˆ Pidgin çš„ç›¸é—œé¸é …ï¼Œä¾‹å¦‚å¥½å‹æ¸…å–®çš„åœé§åŠŸèƒ½ã€‚"
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>å·²ç™»å‡ºã€‚</font>"
 
@@ -18169,29 +18446,29 @@ msgstr "<font color='#777777'>å·²ç™»å‡ºã
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP ç›£æŽ§å™¨"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "å¸³è™Ÿï¼š"
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>æœªæœ‰é€£ç·šè‡³ XMPP</font>"
 
 #  NOTE Jabber çš„ã€Œstanzaã€è¯ã€Œæ®µè½ã€ï¼Œä¸‹åŒ
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "æ’å…¥ <iq/> æ®µè½ã€‚"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "æ’å…¥ <presence/> æ®µè½ã€‚"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "æ’å…¥ <message/> æ®µè½ã€‚"
 
@@ -18199,15 +18476,47 @@ msgstr "æ’å…¥ <message/> æ®µè½ã€‚"
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "é€å‡ºã€è®€å–æœªåŠ å·¥çš„ XMPP æ®µè½ã€‚"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "å¹«åŠ©ç‚º XMPP ä¼ºæœå™¨æˆ–å®¢æˆ¶ç«¯é€²è¡Œé™¤éŒ¯ã€‚"
 
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "å¸è¼‰æ¨¡çµ„é€”ä¸éé‡éŒ¯èª¤ã€‚"
+
+#~ msgid "Couldn't open file"
+#~ msgstr "ç„¡æ³•é–‹å•Ÿæª”æ¡ˆ"
+
+# XXX è¯æ–‡æœ‰å¾…æ”¹é€²
+#~ msgid "Error initializing session"
+#~ msgstr "å°å·¥ä½œéšŽæ®µé€²è¡Œåˆå§‹åŒ–æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤"
+
+# XXX ç›´è¯ã€Œå¥½å‹ä¼ºæœå™¨ã€å¥½åƒä¸å¤ªå¦¥
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "ç„¡æ³•é€£ç·šåˆ°å¥½å‹è³‡è¨Šä¼ºæœå™¨ã€‚"
+
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "ç„¡æ³•é€£ç·šåˆ° OIM ä¼ºæœå™¨ã€‚"
+
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "ç„¡æ³•ä½¿ç”¨ SSL å”å®šé€£ç·šåˆ°ä¼ºæœå™¨ã€‚"
+
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s çµæŸé€£ç·šï¼š%s</span>"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
+#~ msgstr ""
+#~ "%s\n"
+#~ "åœ¨æ‚¨æ›´æ£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼Œ%s å°‡ä¸æœƒå†è©¦è‘—é‡æ–°é€£ç·šã€‚"
+
 #~ msgid "Sort by status"
 #~ msgstr "ä¾ç…§ç‹€æ…‹æŽ’åˆ—"
 
@@ -18229,12 +18538,6 @@ msgstr "å¹«åŠ©ç‚º XMPP ä¼ºæœå™¨æˆ–å®¢æˆ
 #~ msgid "_Send To"
 #~ msgstr "å‚³é€åˆ°(_S)"
 
-#~ msgid "Has you"
-#~ msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN å”å®šæ¨¡çµ„"
-
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/å¸³è™Ÿ(_A)/æ–°å¢ž\\/ç·¨è¼¯"
 
@@ -18959,9 +19262,6 @@ msgstr "å¹«åŠ©ç‚º XMPP ä¼ºæœå™¨æˆ–å®¢æˆ
 #~ msgid "UDP port"
 #~ msgstr "UDPé€šè¨ŠåŸ "
 
-#~ msgid "Disabled"
-#~ msgstr "åœç”¨"
-
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "æœ‰æœªè®€å–è¨Šæ¯æ™‚ï¼Œé–ƒçˆå·¥ä½œåŒ£åœ–ç¤º..."
 
@@ -19188,12 +19488,6 @@ msgstr "å¹«åŠ©ç‚º XMPP ä¼ºæœå™¨æˆ–å®¢æˆ
 #~ msgid "%s went away"
 #~ msgstr "%s å·²ç¶“é›¢é–‹"
 
-#~ msgid "New Status..."
-#~ msgstr "æ–°ç‹€æ…‹..."
-
-#~ msgid "Saved Status..."
-#~ msgstr "å„²å˜ç‹€æ…‹..."
-
 #~ msgid "(+%d more)"
 #~ msgstr "ï¼ˆä»¥åŠå¦å¤– %d å€‹ï¼‰"
 
