pidgin: 91357eeb: Chinese (Traditional) translation update...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 91357eebdc16d3f2fe03afbef8f6dec2a131ed6f
Ancestor: 1462eeb0565e96652199006fac8da39e94fe39e1
Author: nosnilmot at pidgin.im
Date: 2008-03-25T14:36:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/91357eebdc16d3f2fe03afbef8f6dec2a131ed6f

Modified files:
        po/ChangeLog po/zh_TW.po

ChangeLog: 

Chinese (Traditional) translation updated (Ambrose C. Li)
Closes #4977

-------------- next part --------------
============================================================
--- po/ChangeLog	e5732a7e87f1c29f88e173b31f5c355fd60e8e07
+++ po/ChangeLog	68bed0c67d29f253f9b04208f1be55acba88bd94
@@ -2,6 +2,7 @@ version 2.4.1
 
 version 2.4.1
 	* Arabic translation updated (Khaled Hosny)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Estonian translation updated (Ivar Smolin)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
============================================================
--- po/zh_TW.po	141fab6666bf5ad21c373efbb28bdca5e8bd751a
+++ po/zh_TW.po	a18a43762870c6278b9b95ad87f241b1a81b856a
@@ -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>
+# Copyright (C) 2002-2008, Paladin R. Liu <paladin at ms1.hinet.net>
+# Copyright (C) 2003-2008, 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.518 2007/11/14 05:19:25 acli Exp $
+# $InternalId: zh_TW.po,v 1.526 2008/03/01 02:16:21 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -36,7 +36,7 @@
 # - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
 #
 # FIXME 未有統一譯法的字詞：Buddy List, Postal code、Profile、match、connect、user info
-# FIXME「such」應為「斯」，即「這個」，但目前譯文沒有統一
+# FIXME「such」應為「斯」，即「這種/這樣的」，但目前譯文沒有統一
 # NOTE  中文統一用「」引號；URL、指令等該用 '/" 者除外
 # NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖)，現在不分了
 # NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫，有時用封鎖比較好。
@@ -48,9 +48,9 @@ msgstr ""
 #
 msgid ""
 msgstr ""
-"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"
+"Project-Id-Version: Pidgin 2.4.0\n"
+"POT-Creation-Date: 2008-02-29 03:22-0500\n"
+"PO-Revision-Date: 2008-02-11 03:15-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"
@@ -61,8 +61,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #  NOTE Untranslated
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -93,7 +95,7 @@ msgstr ""
 "  -v, --version       顯示版本訊息並離開\n"
 
 #  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:744
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -103,15 +105,15 @@ msgstr ""
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
 "並透過 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:189
-#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../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/buddy.c:2036
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1591
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1460
@@ -144,8 +146,8 @@ msgstr "（大概是忘記了執行「ma
 msgid "(You probably forgot to 'make install'.)"
 msgstr "（大概是忘記了執行「make install」了。）"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -173,37 +175,40 @@ msgstr "別名："
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
-#: ../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:1105 ../libpurple/account.c:1394
-#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
+#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
+#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
+#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1222
 #: ../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:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2466
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../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/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1069
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/si.c:1109
 #: ../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/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/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6218
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -211,17 +216,17 @@ msgstr "別名："
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c: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/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3524
+#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5666
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
@@ -235,41 +240,41 @@ msgstr "別名："
 #: ../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:943
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../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
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3540
+#: ../libpurple/protocols/yahoo/yahoo.c:3551 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1152 ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1247 ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../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:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
-#: ../pidgin/gtkrequest.c:327
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s？"
@@ -279,129 +284,150 @@ msgstr "刪除帳號"
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 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: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:5532
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
+#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
+#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5540
 #: ../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
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6767 ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "åŠ å…¥"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
 #, 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:2499
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "å°‡ä½¿ç”¨è€…åŠ å…¥æ‚¨çš„å¥½å‹æ¸…å–®ï¼Ÿ"
 
 #  NOTE: æœ€é ­çš„ %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
 #, 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:2580
-#: ../pidgin/gtkaccount.c:2586
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"上線：%d 人\n"
+"總數：%d 人"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "帳號：%s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"<b>最後見到：</b>%s前"
+
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "é è¨­"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "å¿…é ˆç‚ºå¥½å‹æŒ‡å®šå¸³è™Ÿã€‚"
 
-#: ../finch/gntblist.c:291
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "å¿…é ˆç‚ºå¥½å‹æŒ‡å®šç¾¤çµ„ã€‚"
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "å¿…é ˆæŒ‡å®šå¸³è™Ÿ"
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "所指定的帳號目前沒有連線。"
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
+#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2956
+#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../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:1037
-#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
-#: ../pidgin/gtkrequest.c:328
-msgid "Alias"
-msgstr "別名"
+#  XXX
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "訊息（可以不填）"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "群組"
+# XXX è­¯æ–‡å¯èƒ½ä¸å¤ªé€šé † - acli 20080229
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+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:3242
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3201 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -410,199 +436,221 @@ msgstr "帳號"
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6298
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE åªèƒ½è­¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../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
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/jabber/jabber.c:991
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1596
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "別名"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+msgid "Group"
+msgstr "群組"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "è‡ªå‹•åŠ å…¥"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO è«‹è¦†æŸ¥æ ¸å¯¦ï¼šæ˜¯ã€ŒåŠ å…¥ã€æŠ‘æˆ–ã€Œæ–°å¢žã€?
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6764
 msgid "Add Group"
 msgstr "åŠ å…¥ç¾¤çµ„"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:454
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "修改"
 
 # XXX é‚„æ˜¯ã€Œä¿®æ”¹é¸é …ã€ï¼Ÿ
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:908
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../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:588
-#: ../pidgin/gtkconv.c:1661
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:919
+#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+msgid "Blocked"
+msgstr "封鎖"
+
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:1000
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
-#: ../pidgin/gtkstatusbox.c:264
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1257
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "ç§»å‹•å·²æ¨™è¨˜çš„é …ç›®"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1641 ../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: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/jabber/buddy.c:1251
+#: ../libpurple/protocols/jabber/buddy.c:2221
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1639
+#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -612,95 +660,84 @@ msgstr "切換標記"
 #: ../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:3266
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 ../pidgin/gtkblist.c:3225
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../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
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:789
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:541
 #: ../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
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3703 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "é–’ç½®"
 
-#: ../finch/gntblist.c:1334
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "使用行動裝置中"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"上線：%d 人\n"
-"總數：%d 人"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "帳號：%s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"<b>最後見到：</b>%s前"
-
 # XXX check
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
+#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "模組清單"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
-msgid "New Instant Message"
-msgstr "新即時訊息"
+#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
+msgid "Block/Unblock"
+msgstr "封鎖/解除封鎖"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
+#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "封鎖"
+
+#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "解除封鎖"
+
+#: ../finch/gntblist.c:2598
 msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "請輸入您所想要發送即時訊息對象的帳號。"
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
+msgstr "請輸入您所想要封鎖/解除封鎖對象的帳號。"
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
-#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
+#: ../libpurple/account.c:1418 ../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/jabber.c:1783
 #: ../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/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/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6217
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
@@ -715,89 +752,118 @@ msgstr "請輸入您所想要發送即æ™
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../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
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3539
+#: ../libpurple/protocols/yahoo/yahoo.c:3550 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "確定"
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:760
+msgid "New Instant Message"
+msgstr "新即時訊息"
+
+#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:762
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "請輸入您所想要發送即時訊息對象的帳號。"
+
+#: ../finch/gntblist.c:2698
 msgid "Channel"
 msgstr "é »é“"
 
 # TODO çœ‹èµ·ä¾†æ‡‰è©²ç‚ºåŠ ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œä¸¦æŠŠèŠå¤©å®¤æ­¸é¡žåˆ°æŸå€‹ç¾¤çµ„ã€‚
 # NOTE 譯文更動 by Paladin
-#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:940
+#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "åŠ å…¥èŠå¤©å®¤"
 
-#: ../finch/gntblist.c:2284
+#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "è«‹è¼¸å…¥æ‚¨æƒ³è¦åŠ å…¥çš„èŠå¤©å®¤çš„åç¨±ã€‚"
 
-#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "åŠ å…¥"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
+#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "é¸é …"
 
-#: ../finch/gntblist.c:2330
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2335
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "封鎖/解除封鎖"
+
+#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "åŠ å…¥èŠå¤©å®¤..."
 
-#: ../finch/gntblist.c:2340
+#: ../finch/gntblist.c:2780
 msgid "Show"
 msgstr "顯示"
 
-#: ../finch/gntblist.c:2345
+#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "空的群組"
 
-#: ../finch/gntblist.c:2352
+#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "離線好友"
 
-#: ../finch/gntblist.c:2359
+#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "排序"
 
-#: ../finch/gntblist.c:2364
+#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "依照狀態"
 
-#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
+#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../finch/gntblist.c:2374
+#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "依照日誌大小"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "好友"
+
+#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:553
+msgid "Chat"
+msgstr "聊天"
+
+#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "分組"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "匯入憑證"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "請指定主機名稱"
 
 # XXX 譯文有待改進 - acli 20070913
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "請輸入這張憑證所屬的主機名稱。"
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -806,19 +872,19 @@ msgstr ""
 "無法匯入檔案「%s」。\n"
 "請檢查檔案是否可讀及是否為 PEM æ ¼å¼ã€‚\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "憑證匯入錯誤"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509 憑證匯入失敗"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "選擇PEM憑證"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -827,24 +893,24 @@ msgstr ""
 "無法匯出至檔案「%s」。\n"
 "請確定您有權限寫入目標檔\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "憑證匯出錯誤"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509 憑證匯出失敗"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "匯出 X.509 憑證"
 
-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "%s 的憑證"
 
-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -857,60 +923,60 @@ msgstr ""
 "SHA1 指紋：\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "SSL 主機憑證"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "確定要刪除 %s 的憑證？"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "確定刪除憑證"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "憑證管理"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "主機名稱"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # 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:840
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "資訊"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
 #: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:323
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "關閉"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -922,50 +988,58 @@ msgstr ""
 "\n"
 "在您更正這個錯誤並重新啟動這個帳號前，Finch 將不會再試著重新連線。"
 
-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../finch/gntconv.c:137
+#: ../finch/gntconn.c:156
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"å› å¸³è™Ÿå·²åœæ­¢é€£ç·šï¼Œæ‚¨å·²é›¢é–‹é€™å€‹èŠå¤©å®¤ï¼›ä¸€æ—¦å¸³è™Ÿé‡æ–°é€£ç·šï¼Œå³æœƒè‡ªå‹•é‡æ–°åŠ å…¥é€™å€‹"
+"聊天室。"
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "æŒ‡ä»¤åŸ·è¡Œå¤±æ•—ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: ../finch/gntconv.c:166
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "å› ç‚ºæ‚¨ä¸¦æœªç™»å…¥ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
 # XXX 這是什麼？
-#: ../finch/gntconv.c:245
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:268
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3474
 #, c-format
 msgid ""
 "\n"
@@ -974,65 +1048,69 @@ msgstr ""
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:292
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "您離開了聊天室。"
 
-#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../finch/gntconv.c:463
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:507
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
 
-#: ../finch/gntconv.c:548
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "觀看日誌..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "開始記錄日誌"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "啟動音效"
 
-#: ../finch/gntconv.c:760
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:883
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "æ”¯æ´çš„é™¤éŒ¯é¸é …æœ‰ï¼šversion"
 
-#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
+#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1040,65 +1118,65 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
+#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7773
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
+#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7776
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
+#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7779
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;é¸é …&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
+#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7782
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7788
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:1157
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users：顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:1162
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:1165
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -1106,7 +1184,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:759
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "清除"
 
@@ -1114,113 +1192,174 @@ msgstr "過濾器："
 msgid "Filter:"
 msgstr "過濾器："
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "暫停"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "進度"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "檔名"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "大小"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 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:362
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:380
 #: ../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: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: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
+#: ../libpurple/protocols/jabber/buddy.c:780
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:822
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3297
+#: ../pidgin/gtkblist.c:3311 ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "狀態"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "所有的檔案傳輸完畢時，關閉這個視窗"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "清除已完成的傳輸"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "中止"
 
 #  XXX æš«è­¯
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "已取消"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "失敗"
 
 #  XXX pending Paladin's confirmation - acli 20070713
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
-#: ../finch/gntft.c:431
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "成功存檔至 %s。"
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:357
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "傳輸中"
 
+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "在 %2$s 於 %1$s 的交談"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "在 %2$s 與 %1$s 的交談"
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%Y年%m月"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰ç‹€æ…‹æ”¹è®Šè‡³ç³»çµ±æ—¥èªŒã€é¸é …è¢«å•Ÿå‹•æ™‚ï¼Œç³»çµ±äº‹ä»¶æ‰æœƒè¢«è¨˜éŒ„åˆ°ç³»çµ±æ—¥"
+"誌中。"
+
+#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr "å³æ™‚è¨Šæ¯åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰å³æ™‚è¨Šæ¯ã€é¸é …è¢«é–‹å•Ÿæ™‚æ‰æœƒè¢«è¨˜éŒ„ã€‚"
+
+#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "èŠå¤©å®¤çš„å…§å®¹å°‡åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰çš„èŠå¤©å®¤ã€é¸é …è¢«å•Ÿå‹•æ™‚æ‰æœƒè¢«è¨˜éŒ„ã€‚"
+
+#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "找不到日誌"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "全部日誌大小："
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr ""
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "於 %s 的交談"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "與 %s 的交談"
+
+#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "系統日誌"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "電子郵件"
@@ -1230,11 +1369,11 @@ msgstr "您收到郵件！"
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "主題"
 
@@ -1245,17 +1384,17 @@ msgstr[1] "%s (%s) 有 %d 封新郵件ã€
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "好友資訊"
 
@@ -1263,11 +1402,11 @@ msgstr "繼續"
 msgid "Continue"
 msgstr "繼續"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "邀請"
 
@@ -1276,19 +1415,19 @@ msgstr "(沒有名字)"
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "錯誤"
 
-#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "模組載入失敗"
 
-#: ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "模組卸載失敗"
 
-#: ../finch/gntplugin.c:132
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1305,40 +1444,40 @@ msgstr ""
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:190
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:238
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "æ­¤æ¨¡çµ„ä¸¦ç„¡é¸é …å¯ä¾›è¨­å®šã€‚"
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "載入模組途中遭遇錯誤"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "所指定的檔案不是有效的模組。"
 
-#: ../finch/gntplugin.c:261
+#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr "請開啟「除錯視窗」檢視確實的錯誤訊息。"
 
-#: ../finch/gntplugin.c:324
+#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "請選擇希望安裝的模組"
 
-#: ../finch/gntplugin.c:350
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:401
+#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "安裝模組..."
 
-#: ../finch/gntplugin.c:411
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "設定模組"
 
@@ -1347,188 +1486,188 @@ msgstr "設定模組"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
+#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "帳號："
 
-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "登入"
 
-#: ../finch/gntpounce.c:390
+#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "登出"
 
-#: ../finch/gntpounce.c:391
+#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:392
+#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "返回"
 
-#: ../finch/gntpounce.c:393
+#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "é–’ç½®"
 
-#: ../finch/gntpounce.c:394
+#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:395
+#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:397
+#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:398
+#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "執行動作"
 
-#: ../finch/gntpounce.c:429
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "開啟即時訊息視窗"
 
-#: ../finch/gntpounce.c:430
+#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "彈出通知"
 
-#: ../finch/gntpounce.c:431
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "送出訊息"
 
-#: ../finch/gntpounce.c:432
+#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "執行指令"
 
-#: ../finch/gntpounce.c:433
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "只在我的狀態不為「上線」時啟用"
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "好友狀態捕捉只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "無法新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:632
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "未有設定任何帳號"
 
-#: ../finch/gntpounce.c:633
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰å‰ï¼Œå¿…é ˆå…ˆæ–°å¢žä¸€å€‹å¸³è™Ÿã€‚"
 
-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, 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:839 ../pidgin/gtkpounce.c:1496
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "æœªçŸ¥çš„æ•æ‰äº‹ä»¶ã€‚è«‹å›žå ±é€™å€‹å•é¡Œï¼"
 
@@ -1536,12 +1675,12 @@ msgstr "以鍵盤的使用為基準"
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
@@ -1558,15 +1697,15 @@ msgstr "通知您的好友您正在發è¨
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "æ—¥èªŒæ ¼å¼"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
@@ -1591,119 +1730,138 @@ msgstr "更改狀態為"
 msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:585
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
-#: ../pidgin/gtkrequest.c:1745
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
-#: ../pidgin/gtkrequest.c:1746
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+# NOTE 這是選擇目錄／檔案夾的彈出視窗
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "請選擇目錄..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "繼續搜尋這個類別的聊天室，請按「Enter」鍵。"
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr "讀取"
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "聊天室清單"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "收到訊息"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "訊息收到，開始進行交談"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
-#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
+#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(é è¨­)"
 
-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "選擇音效檔..."
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "音效設定"
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "個人資料"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
+#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "自動"
 
-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "嗶一聲"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
+#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "指令"
 
-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "無音效"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "播放方式："
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1713,55 +1871,55 @@ msgstr ""
 "(請以 %s 代表檔名)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "éŸ³æ•ˆé¸é …"
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "當交談取得輸入焦點發出音效"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
-#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../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:1861
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
+#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "音量(0-100)："
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
+#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "事件"
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "檔案"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
+#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "測試"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
+#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "重置"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
+#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "選擇..."
 
@@ -1782,8 +1940,9 @@ msgstr "狀態清單"
 # FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è­¯
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1803,44 +1962,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:274
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
 #: ../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/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1664
+#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../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/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5678
+#: ../libpurple/protocols/oscar/oscar.c:5896
+#: ../libpurple/protocols/oscar/oscar.c:5910
+#: ../libpurple/protocols/oscar/oscar.c:5926
+#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5940
+#: ../libpurple/protocols/sametime/sametime.c:3336
+#: ../libpurple/protocols/sametime/sametime.c:3342
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/sametime/sametime.c:3427
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../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:1016
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/yahoo/yahoo.c:3799
+#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "訊息"
 
@@ -1890,15 +2049,15 @@ msgstr "儲存並使用"
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "憑證"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "音效"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "狀態"
 
@@ -1997,16 +2156,16 @@ msgstr "多士爐式彈出通知模組"
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>與 %s 於 %s 的交談；</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "使用歷史記錄模組，先要啟用日誌功能"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2017,20 +2176,65 @@ msgstr ""
 "\n"
 "開啟即時訊息及聊天室的日誌功能將會為相同類別的交談留下歷史記錄。"
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "歷史記錄"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr "當新的交談開啟時，這個模組將會把上次的交談內容也顯示出來。"
 
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+msgid "Online"
+msgstr "上線"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:5728
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3136 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3297 ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "離線"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3336
+msgid "Online Buddies"
+msgstr "上線好友"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "離線好友"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "上線/離線"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr "Meebo"
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "不分組"
+
+#  *< name
+#  *< version
+#  *  summary
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "為好友清單提供另類的分組顯示方法。"
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
@@ -2048,74 +2252,74 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:875
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:1084
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:1091
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:1096
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1736
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1339
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "è«‹å¡«å¦¥æ•´ä»½è¡¨æ ¼æ‰€æœ‰çš„æ¬„ä½ã€‚"
 
-#: ../libpurple/account.c:1362
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1369
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1376
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1382
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1390
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1421
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -2126,18 +2330,18 @@ msgstr "設定使用者資訊"
 # XXX libgaim/protocols/* - 「Unknownã€æŒ‡ä¸æ˜Žçš„å¥½å‹ç‹€æ…‹ï¼Œå¯èƒ½æ˜¯æŒ‡ã€Œä¸æ˜Žã€ï¼ˆé€šè¨Šç³»çµ±å›žå ±çš„ç‹€æ…‹æ˜¯ã€Œä¸æ˜Žã€ï¼‰
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../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:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 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:3272 ../pidgin/gtkblist.c:6030
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
+#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3433 ../pidgin/gtkblist.c:6188
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2175,69 +2379,55 @@ msgstr "æ ¸å¯¦å³æ£„æ†‘è­‰"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:886
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "憑證機構"
 
 #  TODO Untranslated - acli 20070913
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1054
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr "SSL Peer 快取"
 
 #. Make messages
-#: ../libpurple/certificate.c:1185
+#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "接受 %s 的憑證嗎？"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1191
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "æ ¸å¯¦ SSL 憑證"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "接受"
 
-#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/certificate.c:1203
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
 msgstr "檢視憑證(_V)"
 
-# FIXME è­¯æ–‡ä¸å¤ªé€šé † - acli 20070913
 #. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1303
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
-"用的服務。"
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#: ../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:1346
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的憑證鍊是無效的。"
@@ -2247,16 +2437,16 @@ msgstr "「%s」出示的憑證鍊是無
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "SSL 憑證錯誤"
 
-#: ../libpurple/certificate.c:1355
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "無效的憑證鏈"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1375
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2264,12 +2454,12 @@ msgstr ""
 "ç„¡æ³•æ ¸å¯¦é€™å¼µæ†‘è­‰ï¼Œå› ç‚ºæ‚¨æ²’æœ‰æ ¹æ†‘è­‰æ©Ÿæ§‹æ†‘è­‰ (root certificate) 的資料庫。"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1398
+#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "這張憑證聲稱由一所 Pidgin ä¸èªè­˜çš„æ ¹æ†‘è­‰æ©Ÿæ§‹ç°½ç™¼ã€‚"
 
-#: ../libpurple/certificate.c:1415
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2279,12 +2469,26 @@ msgstr ""
 "「%s」出示的憑證鍊聲稱它是由某憑證機構簽發，但實際上卻沒有該憑證機構的有效簽"
 "ç« ã€‚"
 
-#: ../libpurple/certificate.c:1424
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr "æ†‘è­‰æ©Ÿæ§‹çš„ç°½ç« æ˜¯ç„¡æ•ˆçš„"
 
+# FIXME è­¯æ–‡ä¸å¤ªé€šé † - acli 20070913
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1434
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
+
 #. Make messages
-#: ../libpurple/certificate.c:1888
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2302,34 +2506,35 @@ msgstr ""
 "失效日期：%s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1897
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "憑證資訊"
 
-#: ../libpurple/connection.c:107
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: ../libpurple/connection.c:180
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "移除註冊錯誤"
 
-#: ../libpurple/connection.c:350
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 登入"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2354
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -2346,45 +2551,45 @@ msgstr "這個訊息太大了。"
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "ä½ æ”¹è®Šæš±ç¨±ç‚º %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -2415,15 +2620,15 @@ msgstr "未命名"
 msgid "No name"
 msgstr "未命名"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "無法建立解析程序\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "無法送出訊息給解析程序\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2432,13 +2637,13 @@ msgstr ""
 "解析 %s 途中發生了錯誤：\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 途中發生了錯誤：%d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2447,20 +2652,20 @@ msgstr ""
 "由解析程序讀取時發生錯誤：\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒：%s"
 
-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "åŽŸå› ä¸æ˜Ž"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2469,7 +2674,7 @@ msgstr ""
 "讀取 %s 途中發生了錯誤：\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2478,7 +2683,7 @@ msgstr ""
 "寫入 %s 途中發生了錯誤：\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2487,40 +2692,40 @@ msgstr ""
 "存取 %s 途中發生了錯誤：\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "目錄是唯讀的。"
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "無法傳送目錄。"
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s ä¸æ˜¯ä¸€èˆ¬æª”æ¡ˆï¼Œå› æ­¤ä¸æœƒè¦†è“‹å®ƒã€‚\n"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎？"
 
 #  XXX æš«è­¯
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2531,60 +2736,60 @@ msgstr ""
 "é ç«¯ä¸»æ©Ÿã€€ï¼š%s\n"
 "é ç«¯é€šè¨ŠåŸ ï¼š%d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libpurple/ft.c:685
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "ä½ å–æ¶ˆäº† %s 的傳送"
 
-#: ../libpurple/ft.c:1108
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2747,28 +2952,28 @@ msgstr "<b><font color=\"red\">這個日
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: ../libpurple/log.c:598
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "純文字"
 
 #  NOTE: xfce 譯「flat file」為「平面檔案」
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "舊式平面檔案"
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "無法記錄這個交談。"
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2777,7 +2982,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2787,16 +2992,16 @@ msgstr ""
 "</b></font> %s<br/>\n"
 
 # XXX æš«è­¯
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案！</b></font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 
-#: ../libpurple/log.c:1500
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
@@ -2867,39 +3072,38 @@ msgstr "自動接受完畢"
 msgid "Autoaccept complete"
 msgstr "自動接受完畢"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "當「%s」要求檔案傳輸時"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "è¨­å®šè‡ªå‹•æŽ¥å—é¸é …"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:2301
+#: ../libpurple/protocols/oscar/oscar.c:2350
+#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6291
+#: ../libpurple/protocols/oscar/oscar.c:6361 ../libpurple/request.h:1458
+#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #  TODO: ä¸é€šé † - 20070414
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "問一問我"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "自動接受"
 
@@ -2917,17 +3121,17 @@ msgstr "自動接受"
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2935,11 +3139,11 @@ msgstr ""
 "檔案儲存路徑\n"
 "（請提供完整路徑）"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "自動拒絕非來自好友清單中的使用者"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2947,10 +3151,10 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../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
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1672
+#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "備註"
 
@@ -3343,6 +3547,14 @@ msgstr "使用Mono讀取.NET模組"
 msgid "Loads .NET plugins with Mono."
 msgstr "使用Mono讀取.NET模組"
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr "開新行適用於即時訊息"
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr "開新行適用於聊天室"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3352,18 +3564,18 @@ msgstr "使用Mono讀取.NET模組"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "開新行"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "顯示訊息前先開新行。"
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -3404,31 +3616,31 @@ msgstr "您可以在「好友狀態捕æ
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../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/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../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:307 ../pidgin/gtkrequest.c:318
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "是"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../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/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../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:308 ../pidgin/gtkrequest.c:319
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "否"
 
@@ -3532,7 +3744,7 @@ msgstr "用來測試是否大部份的æ
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
 #: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509 憑證"
@@ -3543,7 +3755,7 @@ msgstr "X.509 憑證"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3551,8 +3763,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -3672,7 +3884,7 @@ msgstr ""
 "com 下載及安裝 ActiveTCL。\n"
 
 # FIXME 沒有譯「toolkit」- 20071023 acli
-#: ../libpurple/protocols/bonjour/bonjour.c:107
+#: ../libpurple/protocols/bonjour/bonjour.c:101
 msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
@@ -3682,50 +3894,50 @@ msgstr ""
 "pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查"
 "閱 FAQ 部分。"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:126
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:153
+#: ../libpurple/protocols/bonjour/bonjour.c:147
 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:369
-#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
+#: ../libpurple/protocols/jabber/jabber.c:1003
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:375
+#: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../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/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1339
+#: ../libpurple/protocols/jabber/buddy.c:2223
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "E-Mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:378
-#: ../libpurple/protocols/bonjour/bonjour.c:683
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/bonjour/bonjour.c:686
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
@@ -3739,24 +3951,24 @@ msgstr "XMPP 帳號"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:485
-#: ../libpurple/protocols/bonjour/bonjour.c:487
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:628
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr "連絡人"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:680
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/jabber/jabber.c:995
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "電子郵件"
 
@@ -3765,38 +3977,44 @@ msgstr "Bonjour"
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:672
-#: ../libpurple/protocols/bonjour/jabber.c:690
+#: ../libpurple/protocols/bonjour/jabber.c:457
+#: ../libpurple/protocols/bonjour/jabber.c:522
+#: ../libpurple/protocols/bonjour/jabber.c:567
+#: ../libpurple/protocols/bonjour/jabber.c:744
+#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:589
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "設定 Socket é¸é …æ™‚éŒ¯èª¤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:625
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket åˆ°é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/bonjour/jabber.c:635
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1851
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1851
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3868,9 +4086,9 @@ msgstr "註冊成功！"
 msgstr "註冊成功！"
 
 #: ../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
+#: ../libpurple/protocols/jabber/jabber.c:978
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:1769
 msgid "Password"
 msgstr "密碼"
 
@@ -3896,9 +4114,9 @@ msgstr "請輸入以下的欄位"
 
 #: ../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/jabber/jabber.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3849
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3907,14 +4125,14 @@ msgstr "出生年"
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../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:3742
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Gender"
 msgstr "性別"
 
@@ -3923,14 +4141,14 @@ msgstr "男性或女性"
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "ç”·"
 
 #: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -3989,64 +4207,50 @@ msgstr "新增到聊天室..."
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../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:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2040
 #: ../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/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/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 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:1016 ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3695
+#: ../libpurple/protocols/yahoo/yahoo.c:3769 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "離開"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:2767
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:3757
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -4057,7 +4261,7 @@ msgstr "出生年"
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -4102,23 +4306,10 @@ msgstr "連線失敗。"
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../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:1652
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "解除封鎖"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "封鎖"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
@@ -4189,36 +4380,39 @@ msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1569
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:509
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1277
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為：%s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:513
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1281
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "ç„¡æ³•é–‹å•Ÿç›£è½åŸ ã€‚"
 
@@ -4240,85 +4434,85 @@ msgstr "%s 的是日訊息"
 msgstr "%s 的是日訊息"
 
 #: ../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
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: ../libpurple/protocols/irc/irc.c:253
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "é »é“(_C)："
 
-#: ../libpurple/protocols/irc/irc.c:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: ../libpurple/protocols/irc/irc.c:304
+#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:325
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1343
 #: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../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
+#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/irc/irc.c:798
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3424
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "主題"
 
@@ -4330,50 +4524,50 @@ msgstr "主題"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../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/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6768
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../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/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6771
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5786
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/irc/irc.c:963
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../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/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4385,13 +4579,13 @@ msgstr "編碼"
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "姓名"
 
@@ -4399,216 +4593,216 @@ 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:977
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "被禁止"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s：禁止清單已滿"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "æ‰€åœ¨é »é“"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "閒置時間"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "上線自"
 
 #  XXX 其實譯得不太對，可以改進一點
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "光宗耀祖"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 已經把主題清除。"
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為：%s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "IRC 伺服器收到了個它不明白的訊息。"
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者：%s"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為："
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "æ²’æœ‰é‚£å€‹é »é“"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "æ²’æœ‰é‚£å€‹é »é“"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "æ²’æœ‰é‚£å€‹æš±ç¨±æˆ–é »é“"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "無法送出"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "åªæœ‰è¢«é‚€è«‹è€…æ‰å¯åŠ å…¥ %s。"
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:798
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:808 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:826
+#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "暱稱無效"
 
-#: ../libpurple/protocols/irc/msgs.c:913
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的暱稱，暱稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:918
+#: ../libpurple/protocols/irc/msgs.c:926
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱，名稱中大概含有無效字元。"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: ../libpurple/protocols/irc/msgs.c:978
+#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "æ‚¨é›¢é–‹äº†é »é“%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1020
+#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "ç„¡æ³•åŠ å…¥ %sï¼šå¿…é ˆè¨»å†Šã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:1114
+#: ../libpurple/protocols/irc/msgs.c:1122
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "ç„¡æ³•åŠ å…¥é »é“"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#: ../libpurple/protocols/irc/msgs.c:1148
+#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨è©²å€‹æš±ç¨±æˆ–é »é“ã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:1160
+#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -4713,7 +4907,7 @@ msgstr "names [é »é“]：列出目前在
 msgstr "names [é »é“]ï¼šåˆ—å‡ºç›®å‰åœ¨é »é“ä¸­çš„ä½¿ç”¨è€…æ¸…å–®ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
@@ -4721,7 +4915,12 @@ msgstr "nickserv：送出一個指令到
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv：送出一個指令到 nickserv"
 
+# FIXME WRONG SOURCE TEXT
 #: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;對象&gt;ï¼šå‘ä½¿ç”¨è€…æˆ–é »é“ç™¼å‡ºå‘Šç¤ºã€‚"
+
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4729,7 +4928,7 @@ msgstr ""
 "op &lt;暱稱&gt; [暱稱] ...ï¼šè³¦èˆ‡æŸå€‹ä½¿ç”¨è€…ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™ã€‚æ‚¨å¿…é ˆå…·æœ‰ã€Œé »"
 "道管理者」權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4737,11 +4936,11 @@ msgstr ""
 "operwall &lt;訊息&gt;：如果您不知道這是幹什麼用的，您可能沒有辦法使用這個指"
 "令。"
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr "operserv：送出一個指令到 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4749,7 +4948,7 @@ msgstr ""
 "part [é »é“] [訊息]ï¼šé›¢é–‹ç›®å‰çš„é »é“æˆ–æŒ‡å®šçš„é »é“ã€‚æŒ‡å®šé »é“æ™‚å¯åŒæ™‚æŒ‡å®šé€å‡ºçš„è¨Š"
 "息。"
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4757,7 +4956,7 @@ msgstr ""
 "ping [暱稱]：查詢某一個使用者的網路回應速度（或在沒有指定使用者時，查詢伺服器"
 "的回應速度）。"
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4765,16 +4964,16 @@ msgstr ""
 "query &lt;暱稱&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免發送到公"
 "çœ¾é »é“ï¼‰ã€‚"
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]：自伺服器離線，並送出指定的訊息。"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]：送出一個 RAW 指令到伺服器。"
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4782,23 +4981,23 @@ msgstr ""
 "remove &lt;暱稱&gt; [訊息]ï¼šå°‡æŸå€‹ä½¿ç”¨è€…è¸¢å‡ºé »é“ã€‚æ‚¨å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„"
 "æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time：顯示 IRC 伺服器所在地之本地時間。"
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]ï¼šæª¢è¦–æˆ–ä¿®æ”¹é »é“ä¸»é¡Œ"
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;：設定或解除使用者模式。"
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [暱稱]：給使用者送出 CTCP VERSION 要求"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4806,7 +5005,7 @@ msgstr ""
 "voice &lt;暱稱&gt; [暱稱] ...ï¼šè³¦èˆ‡ä½¿ç”¨è€…çš„ã€Œç™¼è¨€ã€æ¬Šé™ã€‚æ‚¨å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†"
 "者」的權限才能執行這個動作。"
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4814,38 +5013,38 @@ msgstr ""
 "wallops &lt;message&gt;：如果您不知道這是幹什麼用的，您可能就沒有辦法使用它"
 "了。"
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;：取得使用者資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;暱稱&gt;：取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:520
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641 ../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:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:732
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
@@ -4867,7 +5066,7 @@ msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè­‰"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4876,300 +5075,299 @@ msgstr "%s éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸
 
 #: ../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
+#: ../libpurple/protocols/jabber/auth.c:528
+#: ../libpurple/protocols/jabber/auth.c:529
+#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../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 "伺服器並不提供任何一種被支援的認證方式"
-
-#: ../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/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:653
+#: ../libpurple/protocols/jabber/auth.c:901
+#: ../libpurple/protocols/jabber/auth.c:1050
+#: ../libpurple/protocols/jabber/auth.c:1077
+#: ../libpurple/protocols/jabber/auth.c:1101
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
 
-#: ../libpurple/protocols/jabber/auth.c:616
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+#: ../libpurple/protocols/jabber/auth.c:722
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè­‰ã€‚å…è¨±ä¸¦ç¹¼çºŒé€²è¡Œèªè­‰ï¼Ÿ"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4174
+#: ../libpurple/protocols/jabber/buddy.c:1223
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:1235
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1031
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr "市／村"
 
 #: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "省／州"
 
 #: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:1299
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "國家"
 
 #: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1310
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/jabber/buddy.c:1254
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1369
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkprefs.c:740
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "編輯 XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:726
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：Pidgin）
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:797
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:801
+#: ../libpurple/protocols/jabber/buddy.c:966
 msgid "Operating System"
 msgstr "作業系統"
 
 # NOTE 這是功能名稱（直譯）
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Last Activity"
 msgstr "最近活動"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Info"
 msgstr "服務探尋資訊"
 
 #  FIXME acli 2070914
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Service Discovery Items"
 msgstr "æœå‹™æŽ¢å°‹é …ç›®"
 
 # NOTE 這是功能名稱（直譯）
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Extended Stanza Addressing"
 msgstr "延伸段落定址"
 
 # NOTE 這是功能名稱
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
 msgid "Multi-User Chat"
 msgstr "多用戶聊天"
 
 # NOTE 這是功能名稱（直譯）
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "多用戶聊天延伸上線狀態資訊"
 
 # NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "In-Band Bytestreams"
 msgstr "帶內位元組串流"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Ad-Hoc Commands"
 msgstr "臨時指令"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "PubSub Service"
 msgstr "PubSub 服務"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "SOCKS5 Bytestreams"
 msgstr "SOCKS5 位元組串流"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "Out of Band Data"
 msgstr "帶外數據"
 
 #  NOTE Untranslated
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "In-Band Registration"
 msgstr "帶內註冊"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Location"
 msgstr "使用者所在位置"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "User Avatar"
 msgstr "使用者化身"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Chat State Notifications"
 msgstr "聊天狀態通知"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Software Version"
 msgstr "軟體版本"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
 msgid "Stream Initiation"
 msgstr "開始串流"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/sametime/sametime.c:3285
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Mood"
 msgstr "使用者情緒"
 
 # XXX may be wrong
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
 msgid "User Activity"
 msgstr "使用者活動狀態"
 
 #  NOTE 直譯：個體能力
 #  FIXME 譯文有待改進 - acli 20070918
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Entity Capabilities"
 msgstr "個體能力"
 
 #  FIXME 這聽來不對 - acli 20070913
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "Encrypted Session Negotiations"
 msgstr "åŠ å¯†å·¥ä½œéšŽæ®µå”å•†"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
 msgid "User Tune"
 msgstr "使用者樂曲"
 
 #  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
 #  FIXME 譯文有待改進 - acli 20070918
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Roster Item Exchange"
 msgstr "å¥½å‹æ¸…å–®é …ç›®äº¤æ›"
 
@@ -5177,91 +5375,91 @@ msgstr "å¥½å‹æ¸…å–®é …ç›®äº¤æ›"
 #  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
 #  NOTE 直譯：可抵達性位址
 #  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Reachability Address"
 msgstr "可抵達性位址"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "User Profile"
 msgstr "使用者資料"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Jingle Audio"
 msgstr "Jingle 音訊"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "User Nickname"
 msgstr "使用者暱稱"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE UDP"
 msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle ICE TCP"
 msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Raw UDP"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle Video"
 msgstr "Jingle 視訊"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Jingle DTMF"
 msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Message Receipts"
 msgstr "收到的訊息"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "Public Key Publishing"
 msgstr "發佈公鑰"
 
 # NOTE Jabber æ–°åŠŸèƒ½è¦æ ¼
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Chatting"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Browsing"
 msgstr "使用者瀏覽"
 
 # NOTE Jabber æ–°åŠŸèƒ½è¦æ ¼
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Gaming"
 msgstr ""
 
 # NOTE Jabber æ–°åŠŸèƒ½è¦æ ¼
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "User Viewing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
 #: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
@@ -5269,51 +5467,51 @@ msgstr "Ping"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Stanza Encryption"
 msgstr "æ®µè½åŠ å¯†"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Entity Time"
 msgstr ""
 
 #  XXX æš«è­¯- acli 20070913
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Delayed Delivery"
 msgstr "延遲送出"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Collaborative Data Objects"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "STUN Service Discovery for Jingle"
 msgstr "Jingle 用的 STUN 服務偵測"
 
 # FIXME 這聽來不對
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "ç°¡åŒ–åŠ å¯†å·¥ä½œéšŽæ®µå”å•†"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr "中繼段檢查"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Capabilities"
 msgstr "相容性"
 
@@ -5322,66 +5520,66 @@ msgstr "相容性"
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1663
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1241
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:979
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1011
+#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3848
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
+#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -5390,51 +5588,51 @@ msgstr "要求或重新要求認證"
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
 msgstr "登入"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
 msgstr "登出"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/jabber.c:1620
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/jabber/buddy.c:2048
+#: ../libpurple/protocols/jabber/jabber.c:1662
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
+#: ../libpurple/protocols/jabber/buddy.c:2336
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5442,70 +5640,70 @@ msgstr ""
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2352
+#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:2353
+#: ../libpurple/protocols/jabber/buddy.c:2357
 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:2387
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2418
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2429
 #: ../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:5657
+#: ../libpurple/protocols/qq/sys_msg.c:177
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5665
 #: ../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:2440
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5412
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
@@ -5613,15 +5811,19 @@ msgstr "寫入錯誤"
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "Ping逾時"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/jabber/jabber.c:525
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
-#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2576
+#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5630,154 +5832,154 @@ msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:550
+#: ../libpurple/protocols/jabber/jabber.c:582
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:632
+#: ../libpurple/protocols/jabber/jabber.c:1117
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:605
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP å¸³è™Ÿç„¡æ•ˆï¼ŒåŸŸåæ˜¯å¿…é ˆè¨­å®šçš„ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:683
+#: ../libpurple/protocols/jabber/jabber.c:717
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:689
+#: ../libpurple/protocols/jabber/jabber.c:723
 #, c-format
 msgid "Registration to %s successful"
 msgstr "成功註冊 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:726
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:734
+#: ../libpurple/protocols/jabber/jabber.c:735
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:753
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "成功移除 %s 的註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:756
 msgid "Unregistration Successful"
 msgstr "移除註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
+#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:765
 msgid "Unregistration Failed"
 msgstr "移除註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:891
-#: ../libpurple/protocols/jabber/jabber.c:892
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:932
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/jabber/jabber.c:1019
+#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3850
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1023
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1027
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1035
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid "Unregister"
 msgstr "移除註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1021
+#: ../libpurple/protocols/jabber/jabber.c:1046
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "請填寫以下資料以更新您的註冊資料。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1033
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1059
+#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1064
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "變更 %s 上的註冊資訊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/jabber/jabber.c:1065
 #, c-format
 msgid "Register New Account at %s"
 msgstr "註冊在 %s 的新帳號"
 
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Change Registration"
 msgstr "變更註冊資訊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
-#: ../libpurple/protocols/jabber/jabber.c:1152
+#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "Error unregistering account"
 msgstr "移除帳號註冊錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Account successfully unregistered"
 msgstr "移除帳號註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1347
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1352
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS 初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/jabber/jabber.c:1356
 #: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
+#: ../libpurple/protocols/jabber/jabber.c:1365
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1427
-#: ../libpurple/protocols/jabber/jabber.c:1879
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1917
 #: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
+#: ../libpurple/protocols/jabber/jabber.c:1998
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5726
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5786,50 +5988,50 @@ 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:1475
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
 # FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è­¯
 #  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "From"
 msgstr "已認證對方"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1518
 #: ../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:1489
+#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../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/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1665
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
@@ -5838,118 +6040,115 @@ msgstr "心情"
 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 "正在播放"
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr ""
 
 # XXX 要覆查 - acli 20070914
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1638
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Mood Text"
 msgstr "描述情緒"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1640
+#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1668
 msgid "Allow Buzz"
 msgstr "允許「嗶」功能"
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Artist"
 msgstr "樂手名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune Title"
 msgstr "樂曲名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1688
 msgid "Tune Album"
 msgstr "專輯名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Genre"
 msgstr "樂曲種類"
 
 # XXX 譯文有待改進
-#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Comment"
 msgstr "樂曲註釋"
 
 # NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
 # FIXME 
-#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Track"
 msgstr "樂曲 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Time"
 msgstr "樂曲長度"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Year"
 msgstr "作曲年份"
 
-#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune URL"
 msgstr "樂曲網址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1710
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1717
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1743
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1781
+#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/oscar/oscar.c:6512
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/jabber/jabber.c:1801
+#: ../libpurple/protocols/oscar/oscar.c:6523
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1003
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1806
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -5957,52 +6156,52 @@ msgstr "傳送網址時發生了不明çš
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1901
 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:1865
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Forbidden"
 msgstr "æ¬Šé™ä¸å¤ "
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1905
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1950
+#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1988
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Item Not Found"
 msgstr "é …ç›®æœªæ‰¾åˆ°"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1911
 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:1875
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1919
 msgid "Payment Required"
 msgstr "å¿…é ˆä»˜æ¬¾"
 
@@ -6010,78 +6209,78 @@ msgstr "å¿…é ˆä»˜æ¬¾"
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTEã€Œæš«æ™‚ç„¡æ³•è¯çµ¡ã€æ‡‰è©²æ¯”ã€Œä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1921
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Registration Required"
 msgstr "å¿…é ˆè¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1889
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Remote Server Not Found"
 msgstr "é ç«¯ä¼ºæœå™¨æœªæ‰¾åˆ°"
 
-#: ../libpurple/protocols/jabber/jabber.c:1891
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Remote Server Timeout"
 msgstr "é ç«¯ä¼ºæœå™¨é€¾æ™‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
+#: ../libpurple/protocols/jabber/jabber.c:1931
 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:1895
+#: ../libpurple/protocols/jabber/jabber.c:1933
 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:1897
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Subscription Required"
 msgstr "å¿…é ˆèªè­‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Unexpected Request"
 msgstr "æœªé æœŸçš„è¦æ±‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Bad Format"
 msgstr "ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -6091,222 +6290,224 @@ 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:1940
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1980
 #: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/silc10/ops.c:1725
 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:1944
+#: ../libpurple/protocols/jabber/jabber.c:1982
 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:1946
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
+#: ../libpurple/protocols/jabber/jabber.c:1986
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
+#: ../libpurple/protocols/jabber/jabber.c:1990
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME å¿…é ˆè¦†æŸ¥è­¯æ–‡
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1992
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1994
 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:1958
+#: ../libpurple/protocols/jabber/jabber.c:1996
 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:1962
+#: ../libpurple/protocols/jabber/jabber.c:2000
 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:1964
+#: ../libpurple/protocols/jabber/jabber.c:2002
 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:1966
+#: ../libpurple/protocols/jabber/jabber.c:2004
 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:1968
+#: ../libpurple/protocols/jabber/jabber.c:2006
 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:1970
+#: ../libpurple/protocols/jabber/jabber.c:2008
 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:1972
+#: ../libpurple/protocols/jabber/jabber.c:2010
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/jabber.c:2012
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1976
+#: ../libpurple/protocols/jabber/jabber.c:2014
 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:1978
+#: ../libpurple/protocols/jabber/jabber.c:2016
 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:1980
+#: ../libpurple/protocols/jabber/jabber.c:2018
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
+#: ../libpurple/protocols/jabber/jabber.c:2020
 msgid "XML Not Well Formed"
 msgstr "XML æ–‡ä»¶æ ¼å¼æœ‰å•é¡Œ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
+#: ../libpurple/protocols/jabber/jabber.c:2022
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2069
+#: ../libpurple/protocols/jabber/jabber.c:2107
 #, 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:2089
+#: ../libpurple/protocols/jabber/jabber.c:2127
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX æš«è­¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2094
+#: ../libpurple/protocols/jabber/jabber.c:2132
 #, 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:2113
+#: ../libpurple/protocols/jabber/jabber.c:2151
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX æš«è­¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2118
+#: ../libpurple/protocols/jabber/jabber.c:2156
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:2171
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
-#: ../libpurple/protocols/jabber/jabber.c:2231
+#: ../libpurple/protocols/jabber/jabber.c:2258
+#: ../libpurple/protocols/jabber/jabber.c:2269
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºæ²’æœ‰æœ‰é—œå°æ–¹çš„ä»»ä½•è³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2226
+#: ../libpurple/protocols/jabber/jabber.c:2264
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºå°æ–¹ç›®å‰å¯èƒ½é›¢ç·šã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2295
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºå°æ–¹çš„ç”¨æˆ¶ç«¯ä¸æ”¯æ´é€™å€‹åŠŸèƒ½ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "Buzz"
 msgstr "嗶！"
 
-#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/jabber.c:2316
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了您一聲"
 
 # XXX 這是暫譯 - acli 20070913
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
 #, c-format
 msgid "Buzzing %s..."
 msgstr "正在給 %s 一個嗶..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2347
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2360
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
+#: ../libpurple/protocols/jabber/jabber.c:2365
 msgid "register:  Register with a chat room."
 msgstr "registerï¼šåŠ å…¥ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2337
+#: ../libpurple/protocols/jabber/jabber.c:2371
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2377
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2349
+#: ../libpurple/protocols/jabber/jabber.c:2383
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6315,7 +6516,7 @@ msgstr ""
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2389
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6323,29 +6524,29 @@ msgstr ""
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
+#: ../libpurple/protocols/jabber/jabber.c:2395
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/jabber/jabber.c:2401
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]ï¼šåŠ å…¥ä½æ–¼é€™å€‹ä¼ºæœå™¨çš„ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2407
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
+#: ../libpurple/protocols/jabber/jabber.c:2412
 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:2384
+#: ../libpurple/protocols/jabber/jabber.c:2418
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2389
-#: ../libpurple/protocols/yahoo/yahoo.c:4156
+#: ../libpurple/protocols/jabber/jabber.c:2423
+#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
@@ -6365,7 +6566,7 @@ msgstr "XMPP 協定模組"
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "域名"
 
@@ -6383,8 +6584,8 @@ msgstr "允許使用明文，在未經åŠ
 msgstr "å…è¨±ä½¿ç”¨æ˜Žæ–‡ï¼Œåœ¨æœªç¶“åŠ å¯†çš„ä¸²æµä¸Šé€²è¡Œèªè­‰"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "é€£ç·šåŸ "
 
@@ -6392,12 +6593,16 @@ msgstr "é€£ç·šåŸ "
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3463
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "連結伺服器"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "檔案傳輸代理伺服器"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
@@ -6436,56 +6641,56 @@ msgstr "XML 分析錯誤"
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:435
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:518
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "æ‚¨æ­£è¦å»ºç«‹ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œæ‚¨è¦è¨­å®šå®ƒï¼Œé‚„æ˜¯ä½¿ç”¨é è¨­å€¼ï¼Ÿ"
 
-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:525
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "ä½¿ç”¨é è¨­å€¼(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:567
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:571
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "åŠ å…¥èŠå¤©å®¤ %s 時發生錯誤"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ä¸æ”¯æ´æª”æ¡ˆå‚³è¼¸"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
-#: ../libpurple/protocols/jabber/si.c:838
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "無法送出訊息給 %sï¼Œå› ç‚ºé€™å€‹ JID 是無效的"
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ç›®å‰æ²’æœ‰é€£ç·š"
@@ -6493,18 +6698,18 @@ msgstr "無法傳送檔案至 %sï¼Œå› ç‚
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
 #  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#: ../libpurple/protocols/jabber/si.c:842
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºæœªç²å°æ–¹èªè­‰"
 
 #  FIXME é€™ä¸é€šé † - acli 20070614
-#: ../libpurple/protocols/jabber/si.c:857
+#: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-#: ../libpurple/protocols/jabber/si.c:873
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
@@ -6644,7 +6849,7 @@ msgstr "不在清單中"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6710,7 +6915,7 @@ msgstr "FND 的結果有太多匹配"
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "尚未登入"
 
@@ -6834,10 +7039,10 @@ msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1399
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6881,52 +7086,52 @@ msgstr "MSN 錯誤：%s\n"
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "呼叫"
 
-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s 呼叫您！"
 
-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "呼叫 %s 中..."
 
-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
 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?"
@@ -6934,392 +7139,411 @@ msgstr ""
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "住家電話號碼"
+
+#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "工作電話號碼"
+
+#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "行動電話號碼"
+
+#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3114
+#: ../libpurple/protocols/yahoo/yahoo.c:3803
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3806
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3818
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3824
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "樂手名稱"
 
-#: ../libpurple/protocols/msn/msn.c:724
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "專輯名稱"
 
-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
+#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../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/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
+#: ../libpurple/protocols/msnp9/msn.c:1527
+#: ../libpurple/protocols/msnp9/msn.c:1870
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1102
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/myspace/user.c:133
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "所在位置"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1752 ../libpurple/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
+#: ../libpurple/protocols/msnp9/msn.c:1608
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1758 ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
+#: ../libpurple/protocols/msnp9/msn.c:1614
+#: ../libpurple/protocols/msnp9/msn.c:1734
+#: ../libpurple/protocols/msnp9/msn.c:1740
+#: ../libpurple/protocols/msnp9/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1755
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1633
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1785 ../libpurple/protocols/msn/msn.c:1966
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1641
+#: ../libpurple/protocols/msnp9/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1828
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1144
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3840
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1689
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3861
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1691
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../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
+#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msnp9/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:1991
+#: ../libpurple/protocols/msnp9/msn.c:1847
 #: ../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:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2015
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:2016
+#: ../libpurple/protocols/msnp9/msn.c:1872
 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 "
@@ -7328,17 +7552,17 @@ msgstr ""
 "MSN å›žå ±èªªæ‰¾ä¸åˆ°é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚é€™è¡¨ç¤ºé€™å€‹ä½¿ç”¨è€…å¯èƒ½ä¸å­˜åœ¨ï¼›äº¦æœ‰å¯èƒ½ä½¿"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1876
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "åœ¨é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ç¶²é æ‰¾ä¸åˆ°ä»»ä½•å¯ç”¨çš„è³‡æ–™ã€‚é€™å€‹ä½¿ç”¨è€…æ¥µæœ‰å¯èƒ½ä¸¦ä¸å­˜åœ¨ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1884
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1246
 msgid "Profile URL"
 msgstr "個人資料網址"
 
@@ -7352,28 +7576,28 @@ msgstr "個人資料網址"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
 # XXX 譯文有待改進 - acli 20070918
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "HTTP 方式專用伺服器"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -7402,8 +7626,8 @@ msgstr "%s 不是一個有效的群組ã€
 #: ../libpurple/protocols/msn/notification.c:931
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
@@ -7426,39 +7650,39 @@ msgstr "不明錯誤（代碼 %d）"
 msgstr "不明錯誤（代碼 %d）"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
 #  TODO 請覆查，譯文有待改進
 #: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
+#: ../libpurple/protocols/msnp9/notification.c:500
 #, 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
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, 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
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, 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
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, 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
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
@@ -7466,24 +7690,24 @@ msgstr "%s 不是一個有效的 Passpor
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:1318
-#: ../libpurple/protocols/msnp9/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1931
-#: ../libpurple/protocols/msnp9/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7526,8 +7750,9 @@ msgstr[1] ""
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -7554,41 +7779,41 @@ msgstr ""
 "%s"
 
 #: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
 #: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
 #  XXX
 #: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
 
 #: ../libpurple/protocols/msn/session.c:370
-#: ../libpurple/protocols/msnp9/session.c:323
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
 #: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證：%s"
 
 #: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
+#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單，請過一會後重試。"
@@ -7596,28 +7821,28 @@ msgstr "暫時無法取得您的好友æ¸
 # See cnscode.org.tw
 #: ../libpurple/protocols/msn/session.c:403
 #: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "交握中"
 
 #: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "認證開始中"
 
 #: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
 #: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
 #: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
@@ -7636,33 +7861,33 @@ msgstr "外出用餐"
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時，可能沒有送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
 msgstr "å› ç‚ºä½¿ç”¨è€…ç›®å‰é›¢ç·šï¼Œæ‰€ä»¥ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "å› ç‚ºé€£ç·šç™¼ç”ŸéŒ¯èª¤ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
 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
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
 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:"
@@ -7670,25 +7895,25 @@ msgstr ""
 "å› ç‚ºç„¡æ³•èˆ‡ä¼ºæœå™¨å»ºç«‹å·¥ä½œéšŽæ®µï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼ˆé€™å¤§æ¦‚æ˜¯ä¼ºæœå™¨å‡ºç¾äº†å•é¡Œï¼Œè«‹"
 "幾分鐘後重試）："
 
-#: ../libpurple/protocols/msn/switchboard.c:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 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
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 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
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, 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
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將您從他（她）的好友清單中移除。"
@@ -7697,17 +7922,17 @@ 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
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
 #: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:645
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
 
@@ -7721,8 +7946,8 @@ msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
@@ -7744,283 +7969,320 @@ msgstr ""
 "無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版或以"
 "上）。"
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是 %d 個字元長。"
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1820
-msgid "MySpaceIM Error"
-msgstr "MySpaceIM 錯誤"
-
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "讀取驗證挑戰中"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
 msgstr "伺服器送來的驗證挑戰有意料之外的長度"
 
-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
 msgstr "登入中"
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, 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:1339
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
 msgstr "有新郵件"
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr "網誌有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr "å€‹äººè³‡æ–™ç¶²é æœ‰æ–°ç•™è¨€"
 
 #  FIXME è­¯æ–‡å¾ˆä¸é€šé † - acli 20070913
-#: ../libpurple/protocols/myspace/myspace.c:1342
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr "有新的交友要求！"
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr "相片集有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../libpurple/protocols/myspace/myspace.c:1585
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM：未有設定使用者名稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr "您似乎未有設定 MySpace 使用者名稱。"
+
+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "您現在就要設定嗎？（注意：設定後是無法修改的！）"
+
 # TODO 要覆查 - 20061027
 #. 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:1554
+#: ../libpurple/protocols/myspace/myspace.c:1611
 #: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "已連結"
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-msgid "No username set"
-msgstr "未有設定使用者名稱"
+#: ../libpurple/protocols/myspace/myspace.c:1846
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "通訊協定錯誤，代碼 %d：%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1566
+# NOTE 第一個 %s 是錯誤訊息
+#: ../libpurple/protocols/myspace/myspace.c:1868
+#, c-format
 msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
 msgstr ""
-"請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選"
-"擇一個使用者名稱後，再嘗試重新登入。"
+"%s 您的密碼的長度為 %d 個字元，超出了估計中 MySpaceIM 所設 %d 字元的上限。請"
+"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword 選擇一個較短的密碼，然後重試。"
 
-#: ../libpurple/protocols/myspace/myspace.c:1794
-#, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "通訊協定錯誤，代碼 %d：%s"
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM 錯誤"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "無法新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
 msgstr "「addbuddy」指令失敗。"
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
 msgstr "「persist」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "無此使用者：%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
+#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
 msgstr "搜尋使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
 msgstr "無法移除使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr "「delbuddy」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
 msgstr "「blocklist」指令失敗"
 
 #  NOTE「condition」可能為「條件」或「狀況」
 #  NOTE 原始碼內這字串是指「cond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITE」
 #  NOTE 所以應是「狀況」而非「條件」
-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
 msgstr "輸入狀況無效"
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-msgid "Read buffer full"
-msgstr "讀取用的暫存區滿了"
+#: ../libpurple/protocols/myspace/myspace.c:2539
+msgid "Read buffer full (2)"
+msgstr "讀取用的暫存區滿了（代號2）"
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "無法解析訊息"
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
+#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "無法連到伺服器：%s (%d)"
 
 #  NOTE 這是群組名稱
-#: ../libpurple/protocols/myspace/myspace.c:2670
+#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
 msgstr "即時訊息的好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, 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:2770
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "å¾žä¼ºæœå™¨åŠ å…¥è¯çµ¡äºº"
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "從 MySpace.com 新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
+#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
 msgstr "匯入好友失敗"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
+#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
+#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
 msgstr "變更即時通訊名稱..."
 
 #  NOTE 這似乎是視窗標題
-#: ../libpurple/protocols/myspace/myspace.c:3184
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr "myim 網址處理器"
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
+#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3186
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr "在狀態列顯示暱稱"
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr "在狀態列顯示標題"
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
+#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
 msgstr "傳送表情圖示"
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr "熒幕解像度（DPI）"
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
 msgstr "基礎字體大小(點)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "使用者"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "é ­æ¢æ¶ˆæ¯"
 
-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "歌曲"
 
-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "好友總數"
 
-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "客戶端版本"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "未有設定使用者名稱"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM：請設定一個使用者名稱"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "請輸入一個使用者名稱，以便檢查有沒有可能取得該使用者名稱："
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM：可取得此使用者名稱"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "您可取得這個使用者名稱，您要使用這個使用者名稱嗎？"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "ä¸€æ—¦è¨­å®šï¼Œä¾¿æ°¸é ç„¡æ³•æ›´æ”¹ï¼"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "這個使用者名稱已無法取得。"
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "請試另一個使用者名稱："
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
-msgstr "放電"
+msgstr "轟擊"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
-msgstr "%s 電了您一下！"
+msgstr "%s 轟了您一下！"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
-msgstr "向 %s 放電中..."
+msgstr "轟擊 %s 中..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
-msgstr "打人"
+msgstr "拳打"
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
-msgstr "%s 打了您一下！"
+msgstr "%s ç”¨æ‹³é ­æ‰“äº†æ‚¨ä¸€ä¸‹ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
-msgstr "打 %s 中..."
+msgstr "拳打 %s 中..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "放火"
 
@@ -8039,57 +8301,57 @@ msgstr "親吻"
 msgid "Smooch"
 msgstr "親吻"
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s 親吻了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "親吻 %s 中..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "擁抱"
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s 擁抱了您！"
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "擁抱 %s 中..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "摑掌"
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s 摑了您一巴掌！"
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "摑 %s 中..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "掐屁股"
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s 掐了您的屁股！"
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "掐 %s 的屁股中..."
@@ -8098,18 +8360,18 @@ msgstr "掐 %s 的屁股中..."
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "High-five"
 
 #  TODO Untranslated
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s high-five 了您！"
 
 #  TODO Untranslated
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "High-five %s 中..."
@@ -8117,16 +8379,16 @@ msgstr "High-five %s 中..."
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "æ•´è ±"
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s æ•´è ±äº†æ‚¨ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "æ•´è ± %s 中..."
@@ -8141,16 +8403,16 @@ msgstr "æ•´è ± %s 中..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "出怪聲"
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s å‘ä½ å‡ºæ€ªè²ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "向 %s 出怪聲中..."
@@ -8392,7 +8654,7 @@ msgstr "Mail Stop"
 msgstr "Mail Stop"
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -8450,27 +8712,27 @@ msgstr "æ‚¨è¦åŠ å…¥å€‹é€™äº¤è«‡å—Žï¼Ÿ"
 msgstr "æ‚¨è¦åŠ å…¥å€‹é€™äº¤è«‡å—Žï¼Ÿ"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "æ‚¨å·²ç¶“è¢«ç™»å‡ºï¼Œå› ç‚ºæ‚¨å·²åœ¨å…¶ä»–é›»è…¦ä¸Šç™»å…¥ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線，所以不會收到您剛才送出的訊息。"
 
-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2521
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -8484,33 +8746,41 @@ msgstr "這個會議已經關閉。無æ³
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "ä¼ºæœå™¨é€šè¨ŠåŸ "
 
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "ç„¡æ³•åŠ å…¥èŠå¤©å®¤"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+msgstr "聊天室名稱無效"
+
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/yahoo.c:2487
+#: ../libpurple/protocols/yahoo/yahoo.c:2655
 #: ../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
+#: ../libpurple/proxy.c:1135 ../libpurple/proxy.c:1244
+#: ../libpurple/proxy.c:1344 ../libpurple/proxy.c:1472
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1147 ../libpurple/proxy.c:1256
+#: ../libpurple/proxy.c:1356 ../libpurple/proxy.c:1484
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8520,9 +8790,9 @@ msgstr ""
 "%s"
 
 #: ../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
+#: ../libpurple/proxy.c:1164 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1368 ../libpurple/proxy.c:1440
+#: ../libpurple/proxy.c:1497
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
@@ -8557,8 +8827,8 @@ msgstr "ICQ 協定模組"
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "編碼"
 
@@ -8602,107 +8872,107 @@ msgstr "檔案「%s」大小為 %s，超
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
 #  XXX 可能是誤譯
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "用戶端不支援"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "被用戶端拒絕"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "SNACè² è¼‰éŽå¤§"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "æ¬Šé™ä¸å¤ "
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "本地端的允許／拒絕清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "太邪惡了（寄件人）"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "Too evil (receiver)"
 msgstr "太邪惡了（收件人）"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:349
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8713,7 +8983,7 @@ msgstr ""
 "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。）"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8723,56 +8993,48 @@ msgstr ""
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../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:6060
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6134
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
 # NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "AP 使用者"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -8783,101 +9045,97 @@ msgstr "ICQ RTF"
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "Trillian åŠ å¯†"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5939
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5925
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:736
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:738 ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-msgid "Online"
-msgstr "上線"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
+#: ../libpurple/protocols/oscar/oscar.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3754
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8886,7 +9144,7 @@ msgstr ""
 "無法連線至認證伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8895,20 +9153,20 @@ msgstr ""
 "無法連線到 BOS 伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1044
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
+#: ../libpurple/protocols/oscar/oscar.c:1306
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8919,34 +9177,34 @@ msgstr ""
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
+#: ../libpurple/protocols/oscar/oscar.c:1392
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -8955,52 +9213,43 @@ msgstr ""
 "ç·šï¼Œé‚£éº¼æ‚¨çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1493
 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
 #.
-#. *
-#. * 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
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:2300
+#: ../libpurple/protocols/oscar/oscar.c:2349
+#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/oscar/oscar.c:6290 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9009,53 +9258,54 @@ msgstr ""
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1578
+#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2256
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "è«‹é€šéŽæˆ‘çš„èªè­‰è¦æ±‚ï¼Œå¥½è®“æˆ‘å¯ä»¥å°‡æ‚¨åŠ å…¥æˆ‘çš„å¥½å‹æ¸…å–®ä¸­ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:2340
+#: ../libpurple/protocols/oscar/oscar.c:2348
+#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:5381
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "æ²’æœ‰çµ¦äºˆåŽŸå› ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9065,17 +9315,17 @@ msgstr ""
 "使用者 %u å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†æ‚¨å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2483
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u åŒæ„äº†æ‚¨å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2491
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9088,7 +9338,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2499
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9101,7 +9351,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9114,38 +9364,38 @@ msgstr ""
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2534
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "æ‚¨æƒ³å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥åˆ°æ‚¨çš„å¥½å‹åå–®ä¸­å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
+#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, 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:2615
+#: ../libpurple/protocols/oscar/oscar.c:2673
 #, 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:2624
+#: ../libpurple/protocols/oscar/oscar.c:2682
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9155,21 +9405,21 @@ msgstr[1] "您遺失了 %hu 個由 %s é€
 msgstr[1] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘å‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2633
+#: ../libpurple/protocols/oscar/oscar.c:2691
 #, 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:2642
+#: ../libpurple/protocols/oscar/oscar.c:2700
 #, 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:2651
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, 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."
@@ -9177,55 +9427,55 @@ msgstr[1] "您遺失了 %hu 個由 %s é€
 msgstr[1] "您遺失了 %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, 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:2875
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2933
 msgid "Unknown reason."
 msgstr "åŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX æ”¹è­¯ã€Œè¨»å†Šæ—¥æœŸã€æœƒå¦æ¯”è¼ƒé€šé †ï¼Ÿ
-#: ../libpurple/protocols/oscar/oscar.c:2911
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3054
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
+#: ../libpurple/protocols/oscar/oscar.c:3296
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "ã€Œç„¡æ³•é¡¯ç¤ºä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒåŒ…å«äº†ç„¡æ•ˆå­—å…ƒã€‚ã€"
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
+#: ../libpurple/protocols/oscar/oscar.c:3460
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9233,110 +9483,110 @@ msgstr ""
 "æ‚¨æœ€è¿‘åšçš„ä¸€å€‹å‹•ä½œç„¡æ³•å®Œæˆï¼Œå› ç‚ºæ‚¨å·²ç¶“é”åˆ°ç™¼é€è¨Šæ¯é€ŸçŽ‡çš„ä¸Šé™ã€‚è«‹ç­‰å¾…åç§’å¾Œå†"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
+#: ../libpurple/protocols/oscar/oscar.c:3545
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "å€‹äººç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3927
+#: ../libpurple/protocols/oscar/oscar.c:3964
 #, 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:3932
+#: ../libpurple/protocols/oscar/oscar.c:3969
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4015
+#: ../libpurple/protocols/oscar/oscar.c:4052
 #, 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:4018
+#: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ ¼å¼åŒ–å¸³è™Ÿï¼Œå› ç‚ºå®ƒæ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4058
 #, 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:4024
+#: ../libpurple/protocols/oscar/oscar.c:4061
 #, 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:4027
+#: ../libpurple/protocols/oscar/oscar.c:4064
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9344,37 +9594,37 @@ msgstr ""
 msgstr ""
 "錯誤 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»å­éƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹é›»å­éƒµä»¶åœ°å€å’Œå¤ªå¤šçš„å¸³è™Ÿç”¢ç”Ÿé—œé€£ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
+#: ../libpurple/protocols/oscar/oscar.c:4067
 #, 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:4033
+#: ../libpurple/protocols/oscar/oscar.c:4070
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+#: ../libpurple/protocols/oscar/oscar.c:4080
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
+#: ../libpurple/protocols/oscar/oscar.c:4082
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
+#: ../libpurple/protocols/oscar/oscar.c:4268
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "ç„¡æ³•å‚³é€å³æ™‚è¨Šæ¯å½±åƒï¼›è¦å‚³é€å³æ™‚è¨Šæ¯å½±åƒï¼Œå¿…é ˆèˆ‡å°æ–¹ç›´æŽ¥é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
+#: ../libpurple/protocols/oscar/oscar.c:4541
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4542
 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 "
@@ -9383,7 +9633,7 @@ msgstr ""
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
+#: ../libpurple/protocols/oscar/oscar.c:4556
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9394,11 +9644,11 @@ msgstr[1] "個人資訊的長度超出äº
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4561
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
+#: ../libpurple/protocols/oscar/oscar.c:4605
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9409,11 +9659,11 @@ msgstr[1] "離開訊息的長度超出äº
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4610
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
+#: ../libpurple/protocols/oscar/oscar.c:4683
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9424,17 +9674,17 @@ msgstr ""
 "æ•ˆé›»éƒµåœ°å€ï¼›æˆ–è€…å¿…é ˆä»¥è‹±æ–‡å­—æ¯ç‚ºé–‹é ­ï¼ŒåŒæ™‚ç”±ã€Œè‹±æ–‡å­—æ¯ã€ã€ã€Œæ•¸å­—ã€å’Œã€Œç©ºç™½ã€"
 "所組成，或者單純以「數字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
+#: ../libpurple/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:5150
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Unable To Add"
 msgstr "ç„¡æ³•åŠ å…¥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4804
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
+#: ../libpurple/protocols/oscar/oscar.c:4805
 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 minutes."
@@ -9442,15 +9692,15 @@ msgstr ""
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "分鐘後取得。"
 
-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5232
+#: ../libpurple/protocols/oscar/oscar.c:5233
+#: ../libpurple/protocols/oscar/oscar.c:5238
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5148
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9459,17 +9709,17 @@ msgstr ""
 "å› ç‚ºæ‚¨çš„å¥½å‹æ³•å–®ä¸­æœ‰å¤ªå¤šçš„å¥½å‹ï¼Œæ‰€ä»¥æ²’æœ‰è¾¦æ³•åŠ å…¥å¥½å‹ %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
+#: ../libpurple/protocols/oscar/oscar.c:5148
+#: ../libpurple/protocols/oscar/oscar.c:5163
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "無法把 %s åŠ å…¥å¥½å‹æ¸…å–®ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5226
+#: ../libpurple/protocols/oscar/oscar.c:5296
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9479,23 +9729,23 @@ msgstr ""
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5234
+#: ../libpurple/protocols/oscar/oscar.c:5304
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
+#: ../libpurple/protocols/oscar/oscar.c:5377
 #, 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:5308
+#: ../libpurple/protocols/oscar/oscar.c:5378
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5381
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9505,32 +9755,28 @@ msgstr ""
 "使用者 %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†æ‚¨å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5382
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5348
+#: ../libpurple/protocols/oscar/oscar.c:5418
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "é »é“è™Ÿç¢¼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr "給予了無效的聊天室名稱。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
+#: ../libpurple/protocols/oscar/oscar.c:5531
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5693
+#: ../libpurple/protocols/oscar/oscar.c:5698
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5698
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -9538,90 +9784,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:5824
+#: ../libpurple/protocols/oscar/oscar.c:5898
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:6006
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:6007
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
+#: ../libpurple/protocols/oscar/oscar.c:6054
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libpurple/protocols/oscar/oscar.c:6058
 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:5990
+#: ../libpurple/protocols/oscar/oscar.c:6064
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6099
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6113
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6126
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6133
+#: ../libpurple/protocols/oscar/oscar.c:6207
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "ICQ Privacy Options"
 msgstr "ICQ éš±ç§é¸é Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
+#: ../libpurple/protocols/oscar/oscar.c:6234
 msgid "The new formatting is invalid."
 msgstr "æ–°çš„æ ¼å¼æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
+#: ../libpurple/protocols/oscar/oscar.c:6235
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "å¸³è™Ÿæ ¼å¼åŒ–åªèƒ½æ”¹è®Šå¤§å¯«ä»¥åŠç©ºç™½ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
+#: ../libpurple/protocols/oscar/oscar.c:6337
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libpurple/protocols/oscar/oscar.c:6338
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9629,80 +9875,73 @@ msgstr ""
 "æ‚¨å¯ä»¥é‡æ–°è¦æ±‚é€™äº›å¥½å‹çš„èªè­‰ï¼Œåªè¦åœ¨å¥½å‹æ¸…å–®ä¸­ä»¥æ»‘é¼ å³éµé»žæ“Šä»–å€‘ï¼Œç„¶å¾Œé¸æ“‡"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
+#: ../libpurple/protocols/oscar/oscar.c:6355
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
+#: ../libpurple/protocols/oscar/oscar.c:6356
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6357
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6360
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#: ../libpurple/protocols/oscar/oscar.c:6518
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (é€éŽç¶²é )..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
+#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Change Password (URL)"
 msgstr "修改密碼 (é€éŽç¶²é )"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (é€éŽç¶²é )"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
+#: ../libpurple/protocols/oscar/oscar.c:6543
 msgid "Set Privacy Options..."
 msgstr "è¨­å®šéš±ç§é¸é …..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libpurple/protocols/oscar/oscar.c:6554
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libpurple/protocols/oscar/oscar.c:6558
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6565
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6576
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr "使用「Recent Buddies」群組"
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
-msgstr "顯示您閒置多久時間"
-
-#: ../libpurple/protocols/oscar/oscar.c:6728
+#: ../libpurple/protocols/oscar/oscar.c:6775
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
-"（較慢，但不會暴露您的 IP 位址）"
+"務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸及\n"
+"直接的即時訊息（較慢，但不會暴露您的 IP 位址）"
 
 #: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
@@ -9912,7 +10151,7 @@ msgstr "無效的 QQ 表情"
 msgstr "無效的 QQ 表情"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
@@ -9930,7 +10169,7 @@ msgstr "拒絕"
 #  NOTE ä¸­æ–‡æŽ¡ç”¨ã€Œä½ ã€æ‡‰è©²ä¹Ÿæ˜¯æ°ç•¶çš„ã€‚
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "å°ä¸èµ·ï¼Œæˆ‘å’Œä½ ï¼Œåˆä¸ä¾†çš„â€¦â€¦"
 
@@ -9970,7 +10209,7 @@ msgstr "想同我交個朋友嗎？"
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "送出"
 
@@ -10027,7 +10266,7 @@ msgstr "使用者 %d è¦æ±‚åŠ å…¥ç¾¤çµ„ 
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "åŽŸå› ï¼š%s"
@@ -10039,16 +10278,16 @@ msgstr "åŽŸå› ï¼š%s"
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "允許"
 
@@ -10136,34 +10375,34 @@ msgstr "群組操作錯誤"
 msgstr "群組操作錯誤"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "è«‹è¼¸å…¥åŽŸå› ï¼š"
 
 #  NOTE QQ「member」應是「成員」
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME æš«è­¯ ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "成功更改了群的資訊"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎？"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "設定"
 
@@ -10183,14 +10422,19 @@ msgstr "取得登入符記途中發生éŒ
 msgid "Error requesting login token"
 msgstr "取得登入符記途中發生錯誤"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "無法登入，請檢查除錯記錄"
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "無法登入，請檢查除錯記錄。"
 
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "無法登入"
+
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../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/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "無法連結。"
@@ -10341,49 +10585,49 @@ msgstr "登入失敗，沒有回應"
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "æ‚¨è¦åŠ å…¥é€™å€‹ä½¿ç”¨è€…åˆ°å¥½å‹æ¸…å–®ä¸­å—Žï¼Ÿ"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s å·²å°‡æ‚¨åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
 
 # FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "æ‚¨è¦å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥æ‚¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s 將您 [%s] åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "使用者 %s 允許了您的要求"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s 想要將您 [%s] åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "訊息：%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
@@ -10467,95 +10711,95 @@ msgstr "Sametime 管理人通告"
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "連線重置"
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "讀取 Socket 時發生錯誤；%s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "會議室關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "無法送出訊息："
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "支援"
 
 #  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, 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:3427
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "建立"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "現有會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10566,29 +10810,29 @@ msgstr ""
 "è­°å®¤ï¼Œä¸¦ä¸”é‚€è«‹é€™å€‹ä½¿ç”¨è€…åŠ å…¥ï¼Œæ‚¨å¯ä»¥é¸æ“‡ã€Œé–‹å•Ÿæ–°æœƒè­°å®¤ã€é¸é …ã€‚"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
 #  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
+#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4426
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10598,43 +10842,43 @@ msgstr ""
 "入。"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3686
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "連線"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知（0x%04x）<br>"
 
 #  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式（如已知）"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明確的使用者 ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10643,16 +10887,16 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者，以便新增至好友清單"
 "內。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者：找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10661,7 +10905,7 @@ msgstr ""
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10670,63 +10914,63 @@ msgstr ""
 "讀取檔案 %s 發生錯誤；\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "å¥½å‹æ¸…å–®å­˜æ”¾æ–¼é ç«¯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組：群組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "å¯èƒ½ç›¸ç¬¦çš„é …ç›®"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10736,26 +10980,26 @@ msgstr ""
 "「%s」可能參考到下列的 Notes é€šè¨ŠéŒ„ç¾¤çµ„ã€‚è«‹è‡ªä¸‹æ–¹é¸å–æ­£ç¢ºçš„ç¾¤çµ„ï¼Œä»¥åŠ å…¥æ‚¨çš„å¥½"
 "友清單。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組：找不到群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../libpurple/protocols/sametime/sametime.c:5493
 #, 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:5526
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/sametime/sametime.c:5535
 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."
@@ -10763,12 +11007,12 @@ msgstr ""
 "輸入 Notes 通訊錄群組名稱於欄位中，以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5576
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10778,59 +11022,59 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
+#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../libpurple/protocols/sametime/sametime.c:5660
 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:5655
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入（忽略伺服器重新導向）"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -11115,98 +11359,98 @@ msgstr "機械人"
 
 #: ../libpurple/protocols/silc/buddy.c:1496
 #: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "開心"
 
 #: ../libpurple/protocols/silc/buddy.c:1498
 #: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "憂愁"
 
 #: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "憤怒"
 
 #: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "嫉妒"
 
 #: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "慚愧"
 
 #: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "無敵"
 
 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "戀愛中"
 
 #: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "想睡"
 
 #: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc10/silc.c:676
+#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "發悶"
 
 #: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc10/silc.c:678
+#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "興奮"
 
 #: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc10/silc.c:680
+#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "憂慮"
 
@@ -11242,8 +11486,8 @@ msgstr "所用裝置"
 #: ../libpurple/protocols/silc/ops.c:1239
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "時區"
 
@@ -11430,8 +11674,8 @@ msgstr "聊天室名稱"
 #: ../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
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "密碼"
 
@@ -11539,21 +11783,21 @@ msgstr "ç„¡æ³•åŠ å…¥å°åœˆå­"
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "呼叫指令"
 
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
 #: ../libpurple/protocols/silc/chat.c:1246
 #: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -11715,7 +11959,7 @@ msgstr "職責"
 #: ../libpurple/protocols/silc/ops.c:1018
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "所屬機構"
 
@@ -11751,7 +11995,7 @@ msgstr "<I>%s</I> çš„é »é“å‰µç«‹è€…ç‚º 
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
 msgid "Real Name"
 msgstr "姓名"
 
@@ -11782,7 +12026,7 @@ msgstr "更多(_M)..."
 #: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:991
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
@@ -11912,24 +12156,24 @@ msgstr "無法追蹤使用者"
 #: ../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
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
 #: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
 #: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "æ ¸å¯¦ä¼ºæœå™¨çš„å…¬é‘°ä¸­"
 
 #: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "å¿…é ˆè¼¸å…¥å¯†ç¢¼"
 
@@ -11973,83 +12217,85 @@ msgstr "不支援的公鑰類型"
 msgstr "不支援的公鑰類型"
 
 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "連線失敗"
 
 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
 #. Progress
 #: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
 #: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "無法讀取 SILC 密鑰對"
 
 #: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "è¨˜æ†¶é«”ä¸å¤ "
 
 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
 #: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "讀取 SILC 密鑰對途中出現錯誤"
 
 #: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "正常"
 
 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "戀愛中"
 
 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12058,48 +12304,48 @@ msgstr ""
 "聯絡方法"
 
 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc10/silc.c:691
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc/util.c:573
+#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "視訊會議中"
 
 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX æš«è­¯
 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "所用之線上服務"
 
 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型，而是操作系統版本 :-/
 #: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
 #: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
@@ -12111,13 +12357,13 @@ msgstr "時區 (UTC)"
 #  XXX 好像很怪
 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
 #: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -12129,21 +12375,21 @@ msgstr ""
 #: ../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:1418
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "是日訊息"
 
 #: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
 #: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1413
+#: ../libpurple/protocols/silc10/silc.c:779
+#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
@@ -12151,194 +12397,194 @@ msgstr "這個連結沒有相關的是æ—
 #: ../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
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
 #: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
 #: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
 #: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "密鑰長度"
 
 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "公鑰檔案"
 
 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "私鑰檔案"
 
 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "密碼（再次輸入）"
 
 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:987
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "上線狀態"
 
 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:995
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
 #: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:999
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
 #: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1098
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
 #: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1289
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1370
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "å¿…é ˆæŒ‡å®šæš±ç¨±"
 
 #: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1472
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
 #: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1477
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s çš„é »é“æ¨¡å¼ç‚ºï¼š%s"
 
 #: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1479
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s æ²’æœ‰è¨­å®šé »é“æ¨¡å¼"
 
 #: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s è¨­å®šé »é“æ¨¡å¼"
 
 #: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1522
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令：%s（可能是客戶端的錯誤）"
 
 #: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1585
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [é »é“]：離開聊天室"
 
 #: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1589
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [é »é“]：離開聊天室"
 
 #: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1593
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]：檢視或修改聊天主題"
 
 #: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1598
+#: ../libpurple/protocols/silc10/silc.c:1601
 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:1813
-#: ../libpurple/protocols/silc10/silc.c:1602
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list：列出目前在網絡上的聊天室清單"
 
 #: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1606
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看這個暱稱的相關資訊"
 
 #: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1610
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2697
 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:1825
-#: ../libpurple/protocols/silc10/silc.c:1614
+#: ../libpurple/protocols/silc10/silc.c:1617
 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:1829
-#: ../libpurple/protocols/silc10/silc.c:1618
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd：顯示伺服器的是日訊息 (MOTD)"
 
 #: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1622
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach：暫停連線這個工作階段"
 
 #: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1626
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]：自伺服器離線，並可選擇送出指定的訊息"
 
 #: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1630
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;：執行 SILC 指定的用戶端指令"
 
 #: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1636
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]：從網路上移除暱稱"
 
 #: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1640
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱"
 
 #: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1644
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;：查看暱稱的相關資訊"
 
 #: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1648
+#: ../libpurple/protocols/silc10/silc.c:1651
 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:1863
-#: ../libpurple/protocols/silc10/silc.c:1652
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12347,17 +12593,17 @@ msgstr ""
 "模式"
 
 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1656
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;：設定您在網路上的模式"
 
 #: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1660
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]：取得伺服器管理者的權限"
 
 #: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1664
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12366,44 +12612,44 @@ msgstr ""
 "è¢«é‚€è€…åˆ—è¡¨ã€æˆ–æŠŠæŒ‡å®šçš„æš±ç¨±å¾žé »é“çš„è¢«é‚€è€…åˆ—è¡¨ä¸­ç§»é™¤"
 
 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1668
+#: ../libpurple/protocols/silc10/silc.c:1671
 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:1883
-#: ../libpurple/protocols/silc10/silc.c:1672
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]：觀看伺服器的管理細節"
 
 #  XXX æš«è­¯
 #: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1676
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;é »é“&gt; +|-&lt;暱稱&gt;]ï¼šæ–¼æŒ‡å®šçš„é »é“ç¦æ­¢æŒ‡å®šçš„ç”¨æˆ¶ç«¯"
 
 #: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1680
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;：取得用戶端或伺服器的公鑰"
 
 #: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1684
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats：觀看伺服器及網路的統計資料"
 
 #: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping：向連結的伺服器送出 PING"
 
 #: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1693
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;é »é“&gt;ï¼šåˆ—å‡ºé »é“ä¸­çš„ä½¿ç”¨è€…"
 
 #: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1697
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12421,39 +12667,39 @@ msgstr ""
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1822
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1824
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "網路"
 
 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
 # XXX æš«è­¯ - 20061025
 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1881
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "åŠ å¯†æ–¹æ³•"
 
 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
@@ -12465,29 +12711,29 @@ msgstr "使用完全向前保密 (PFS)"
 
 #  XXX
 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
 #  XXX 好像聽來很怪
 #: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
 #: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX æš«è­¯
 #: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1906
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
@@ -12588,28 +12834,28 @@ msgstr "公鑰資訊"
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "電腦"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "終端機"
 
@@ -12633,62 +12879,58 @@ msgstr "伺服器沒有統計資料"
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗：版本不符，請更新您的用戶端程式"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸ä¿¡ä»»ï¼ä¸æ”¯æ´æ‚¨çš„å…¬é‘°"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å¯†é‘°äº¤æ›ç¾¤çµ„ (KE group)"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„åŠ å¯†æ–¹å¼ (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: ../libpurple/protocols/silc10/ops.c:1943
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å…¬é–‹é‘°åŒ™è­‰æ›¸æ¨™æº– (PKCS)"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„é›œæ¹Šå‡½æ•¸ (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: ../libpurple/protocols/silc10/ops.c:1949
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„èº«ä»½é©—è­‰ä»£ç¢¼ (HMAC)"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "å¤±æ•—ï¼šéŒ¯èª¤çš„ç°½ç« "
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
 # NOTE é¦™æ¸¯æœƒå¯«ã€Œé™³å¤§æ–‡ã€ï¼Œå°ç£äººæœƒçœ‹ä¸æ˜Žï¼ˆå¯«ã€Œè€å¼µã€ä¸€é¡žï¼Œæ¸¯äººçœ‹è¦‹æœƒè¦ºå¾—å¾ˆæ€ªï¼‰ï¼Œé ­ç—› :P
-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "無名氏"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "無法找到或存取 ~/.silc 目錄"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "無法讀取 SILC 密鑰對：%s"
@@ -12698,7 +12940,7 @@ msgstr "無法寫入"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "無法連結"
 
@@ -12706,22 +12948,22 @@ msgstr "不明的伺服器回應。"
 msgid "Unknown server response."
 msgstr "不明的伺服器回應。"
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1752
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -12733,36 +12975,36 @@ msgstr "SIP 的帳號不可含有空白å
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:2086
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:2092
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2094
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2096
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:2098
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:2100
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -12926,8 +13168,8 @@ msgstr "密碼修改成功"
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
-#: ../pidgin/gtkblist.c:6599
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
+#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "群組(_G)："
 
@@ -12987,27 +13229,27 @@ msgstr "TOC 協定模組"
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:840
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
 # XXX æš«è­¯
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -13016,16 +13258,16 @@ msgstr ""
 "使用者 %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œå‰›å‰›æ‹’çµ•äº†æ‚¨å…ˆå‰å°‡ä»–ï¼ˆå¥¹ï¼‰æ–°å¢žè‡³æ‚¨çš„å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -13035,11 +13277,11 @@ msgstr ""
 "Yahoo ä¼ºæœå™¨è¦æ±‚äº†ä½¿ç”¨ä¸€ç¨®ä¸æ˜Žçš„èªè­‰æ–¹å¼ï¼Œå› æ­¤å¾ˆå¯èƒ½ä¸æœƒæˆåŠŸç™»å…¥ Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -13048,49 +13290,49 @@ msgstr ""
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2133
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "ä½ çš„å¸³æˆ¶ç›®å‰è¢«æš«æ™‚é—œé–‰ã€‚è«‹æ‚¨ç™»å…¥ Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, 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:2192
+#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2311
+#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX æš«è­¯ - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../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/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13099,7 +13341,7 @@ msgstr ""
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13108,28 +13350,28 @@ msgstr ""
 "無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3118
+#: ../libpurple/protocols/yahoo/yahoo.c:3809
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3812
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3122
+#: ../libpurple/protocols/yahoo/yahoo.c:3815
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/protocols/yahoo/yahoo.c:3790
+#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3104
-#: ../libpurple/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -13137,86 +13379,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:3197
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
-#: ../libpurple/protocols/yahoo/yahoo.c:3302
+#: ../libpurple/protocols/yahoo/yahoo.c:3270
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr "å ±ç¨±ä¸Šç·š"
 
 # NOTE Yahoo å®˜æ–¹è­¯ã€Œæ°¸é é¡¯ç¤ºé›¢ç·šã€ï¼Œèªªç™½ä¸€é»žå…¶å¯¦å³æ˜¯ï¼ˆé‡å°æŸäººï¼‰ã€Œé•·æœŸéš èº«ã€
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3323
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr "é•·æœŸå ±ç¨±é›¢ç·š"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE ä¸‹æ¬¡ç™»å…¥æ™‚ä¸å ±ç¨±é›¢ç·šï¼Œæ‰€ä»¥åŠ ã€Œæš«æ™‚ã€å­—çœ¼
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr "æš«æ™‚å ±ç¨±é›¢ç·š"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr "åœæ­¢é•·æœŸå ±ç¨±é›¢ç·š"
 
 # NOTE #gaim çš„ Vann 及 LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3365
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3371
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3399
+#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3405
+#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Activate which ID?"
 msgstr "啟用哪一個 ID？"
 
 # NOTE #gaim çš„ Vann 及 LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3548
+msgid "Join whom in chat?"
 msgstr "åŠ å…¥èª°çš„èŠå¤©å®¤ï¼Ÿ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3560
 msgid "Activate ID..."
 msgstr "å•Ÿå‹• ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3533
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Join User in Chat..."
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3538
+#: ../libpurple/protocols/yahoo/yahoo.c:3569
 msgid "Open Inbox"
 msgstr "開啟收件匣"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;ï¼šåŠ å…¥ä½æ–¼ Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4152
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4160
+#: ../libpurple/protocols/yahoo/yahoo.c:4171
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -13230,57 +13472,57 @@ msgstr "doodle: 要求使用者開始 Do
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4369
-#: ../libpurple/protocols/yahoo/yahoo.c:4371
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Pager port"
 msgstr "å‚³å‘¼ç³»çµ±é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "File transfer port"
 msgstr "æª”æ¡ˆå‚³è¼¸é€šè¨ŠåŸ "
 
 #  XXX ç„¡åŠƒä¸€è­¯æ³•ï¼Œæœ‰è­¯ã€Œåœ°å€ã€ã€ã€Œå€åŸŸã€ç”šè‡³ã€Œå ´æ‰€ã€(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "Yahoo Chat port"
 msgstr "Yahoo èŠå¤©å®¤é€šè¨ŠåŸ "
 
@@ -13292,12 +13534,19 @@ msgstr "送出 Doodle 要求。"
 msgstr "送出 Doodle 要求。"
 
 # TODO - 覆查譯文 - 20061028
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s 提出一次過傳送 %d 個檔案。\n"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "寫入錯誤"
@@ -13323,61 +13572,61 @@ msgstr "您如果想看這則個人資è¨
 "web browser:"
 msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結："
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Latest News"
 msgstr "最新消息"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
 msgid "Home Page"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
 msgid "Last Update"
 msgstr "更新日期"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1211
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "å°ä¸èµ·ï¼Œé€™å‰‡å€‹äººè³‡è¨Šä¼¼ä¹Žæ˜¯ä½¿ç”¨ç›®å‰å°šæœªè¢«æ”¯æ´çš„èªžè¨€æˆ–æ ¼å¼ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1230
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -13386,81 +13635,81 @@ msgstr ""
 "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! 會不"
 "時找不到使用者的個人資料。若果您知道使用者確實存在，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s å©‰æ‹’äº†ä½ è©¢å•ä»–ï¼ˆå¥¹ï¼‰åˆ°æœƒè­°å®¤ã€Œ%s」的邀請，理由是「%s」。"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "ç„¡æ³•åŠ å…¥èŠå¤©å®¤"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "未知聊天室"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "也許聊天室使用者已經到達上限"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "聊天室不存在"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "ç„¡æ³•åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "可能他（她）並不在聊天室內？"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
@@ -13477,30 +13726,30 @@ msgstr ""
 "與伺服器之間的連線突然中斷\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "ï¼ˆç‚ºé€™å€‹è¨Šæ¯è½‰æ›ç·¨ç¢¼æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤ã€‚è«‹æª¢æŸ¥å¸³è™Ÿæ¸…å–®ä¸­çš„ã€Œç·¨ç¢¼ã€é¸é …ï¼‰"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "隱藏或未登入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "任何人"
 
@@ -13511,65 +13760,65 @@ msgstr "任何人"
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "類別／聊天室(_C)："
 
 # XXX æš«è­¯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr "å¯¦é«”ï¼é »é“(_I)："
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr "接受者(_R)："
 
 #  FIXME æš«è­¯
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "åŠ äººèŠå¤©å®¤ï¼ˆäº¤è«‡ï¼‰ %s,%s,%s 失敗"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;：尋找使用者"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;ï¼šè¨­å®šé€™å€‹ã€Œé¡žåˆ¥ã€ï¼ˆèŠå¤©å®¤ï¼‰çš„ã€Œå¯¦é«”ã€ï¼ˆé »é“ï¼‰"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;ï¼šè¨­å®šé€™å€‹ã€Œé¡žåˆ¥ã€ï¼ˆèŠå¤©å®¤ï¼‰çš„ã€Œå¯¦é«”ã€ï¼ˆé »é“ï¼‰"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;ï¼šè¨­å®šé€™å€‹ã€Œé¡žåˆ¥ã€ï¼ˆèŠå¤©å®¤ï¼‰çš„ã€Œå¯¦é«”ã€ï¼ˆé »é“ï¼‰"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;ï¼šåŠ å…¥èŠå¤©å®¤"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;：送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt：送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2745
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13577,7 +13826,7 @@ msgstr ""
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2751
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13585,18 +13834,18 @@ msgstr ""
 "zir &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;：送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr "é‡æ–°åŠ å…¥æ‰€æœ‰èŠå¤©å®¤"
 
 #  FIXME 要覆查譯文
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -13610,16 +13859,16 @@ msgstr "由伺服器取得目前所在è
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2928
+#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr "使用 TZC"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr "TZC 指令"
 
@@ -13629,11 +13878,11 @@ msgstr "TZC 指令"
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -13643,27 +13892,27 @@ msgstr "匯出至 .zephyr.subs 檔"
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr "域名"
 
 # FIXME 暫譯；譯得很差，有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr "現身程度"
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:908 ../libpurple/proxy.c:1067
+#: ../libpurple/proxy.c:1638
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13677,55 +13926,41 @@ msgstr "無法解析 HTTP 代理伺服æ‡
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
 
-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:751 ../libpurple/proxy.c:789
+#: ../libpurple/proxy.c:801
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#: ../libpurple/proxy.c:794
+#: ../libpurple/proxy.c:797
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "拒絕存取：HTTP ä»£ç†ä¼ºæœå™¨ç¦æ­¢é€šè¨ŠåŸ  %d 的資料傳送。"
 
-#: ../libpurple/proxy.c:1022
+#: ../libpurple/proxy.c:1028
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1730
+#: ../libpurple/proxy.c:1736
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * 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
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * 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
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -13737,26 +13972,26 @@ msgstr "我現在不在位子上"
 msgstr "我現在不在位子上"
 
 # FIXME 這很明顯是誤譯，但想不到怎樣寫才對 - 20061025
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "儲存狀態"
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "要求 %s 的注意中..."
 
-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s 要求您注意！"
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13765,12 +14000,12 @@ msgstr ""
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
@@ -13799,7 +14034,7 @@ msgstr "取消設定"
 msgstr "取消設定"
 
 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
@@ -13817,50 +14052,35 @@ msgstr "聽音樂中"
 
 #: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s 從「%s」狀態改變為「%s」"
-
-#: ../libpurple/status.c:613
-#, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:621
 #, c-format
-msgid "%s is now %s"
-msgstr "%s 目前為%s"
-
-#: ../libpurple/status.c:626
-#, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) 目前為%s"
 
-#: ../libpurple/status.c:632
+#: ../libpurple/status.c:627
 #, c-format
-msgid "%s is no longer %s"
-msgstr "%s 不再%s"
-
-#: ../libpurple/status.c:634
-#, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) 不再%s"
 
-#: ../libpurple/status.c:1247
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1264
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
@@ -13870,13 +14090,13 @@ msgstr "%x %X"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2783
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2784
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13884,88 +14104,123 @@ msgstr ""
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3281
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3284
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3310
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3322
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d æ—¥"
 msgstr[1] "%d æ—¥"
 
-#: ../libpurple/util.c:3330
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3336
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3344
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3610
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "無法打開 %s：重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3770
+#: ../libpurple/util.c:3793
 #, 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:3805
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3836
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3861
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
 
+#: ../libpurple/util.c:4697
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4703
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "連線被電腦上的其他軟體中斷。"
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:324
+#, c-format
+msgid "Remote host closed connection."
+msgstr "é ç«¯ä¸»æ©Ÿé—œé–‰äº†é€£ç·šã€‚"
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, c-format
+msgid "Connection timed out."
+msgstr "連線已逾時"
+
+# XXX - 20061027
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
+msgid "Connection refused."
+msgstr "連線被拒。"
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "網路即時通"
@@ -13988,75 +14243,75 @@ msgstr "系統匣方向"
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "ç™»å…¥é¸é …"
 
-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "通訊協定(_T)："
 
-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "帳號(_N)："
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "帳號別名（只在本機生效）(_L)："
 
-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "ä½¿ç”¨è€…è‡ªå®šé¸é …"
 
-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I)："
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "%s é¸é …"
 
-#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE å¯ä»¥æœ‰ä»£ç†ä¼ºæœå™¨ä½†æ¯‹é ˆç”¨
 # NOTE é¦™æ¸¯æ™®éç”¨ã€Œæ¯‹é ˆã€ï¼Œä½†è¬›åœ‹èªžã€Œæ¯‹é ˆã€æœƒä¸é€šé †ï¼Œã€Œä¸ä½¿ç”¨ã€è¼ƒå¥½
-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -14065,72 +14320,73 @@ 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:1009
+#: ../pidgin/gtkaccount.c:978
 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:1012
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "ä»£ç†ä¼ºæœå™¨é¸é …"
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "é€šè¨ŠåŸ (_P)："
 
-#: ../pidgin/gtkaccount.c:1068
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: ../pidgin/gtkaccount.c:1199
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "無法儲存新帳號"
 
-#: ../pidgin/gtkaccount.c:1200
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr "已有一個乎合指定條件的帳號。"
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1504
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "在伺服器上建立這個新帳號"
 
-#: ../pidgin/gtkaccount.c:1520
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "å•Ÿå‹•"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2207
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14152,7 +14408,7 @@ msgstr ""
 "您如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->新增／編輯」指"
 "令，即可返回這個畫面。"
 
-#: ../pidgin/gtkblist.c:543
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -14160,7 +14416,7 @@ msgstr[1] "您目前有 %d 個稱為「%
 msgstr[0] "您目前有 %d 個稱為「%s」的好友，您要把這個好友合併嗎？"
 msgstr[1] "您目前有 %d 個稱為「%s」的好友，您要把這些好友合併嗎？"
 
-#: ../pidgin/gtkblist.c:544
+#: ../pidgin/gtkblist.c:550
 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 "
@@ -14169,341 +14425,365 @@ msgstr ""
 "合併後，這些好友在好友清單將只出現一次，通訊時也會共用一個交談視窗。如果希望"
 "æŠŠé€™äº›å¥½å‹å†æ¬¡åˆ†é–‹ï¼Œåœ¨å¥½å‹æ¸…å–®ä¸­ä»¥æ»‘é¼ å³éµé»žæ“Šå¥½å‹åç¨±ï¼Œå†é¸æ“‡ã€Œå±•é–‹ã€å³å¯ã€‚"
 
-#: ../pidgin/gtkblist.c:546
+#: ../pidgin/gtkblist.c:552
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../pidgin/gtkblist.c:961
+#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+msgid "Room _List"
+msgstr "聊天室清單(_L)"
+
+#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "è«‹è¼¸å…¥é—œæ–¼æ‚¨æ‰€æƒ³åŠ å…¥å¥½å‹æ¸…å–®çš„èŠå¤©å®¤çš„é©ç•¶è³‡è¨Šã€‚\n"
 
-#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
-#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
+#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
-#: ../pidgin/gtkprivacy.c:619
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1304
+#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
 msgstr "移至"
 
-#: ../pidgin/gtkblist.c:1344
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
 
-#: ../pidgin/gtkblist.c:1360
+#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰(_P)..."
 
-#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
-#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
+#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "離線時隱藏"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "離線時顯示"
 
-#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
-#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
+#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1450
+#: ../pidgin/gtkblist.c:1452
 msgid "Add _Buddy..."
 msgstr "新增好友(_B)..."
 
-#: ../pidgin/gtkblist.c:1453
+#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:1456
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "åŠ å…¥(_J)"
 
-#: ../pidgin/gtkblist.c:1480
+#: ../pidgin/gtkblist.c:1482
 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:1482
+#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "保持連線"
 
-#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1548
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
-#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
+#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX æš«è­¯
-#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4813
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2618
+msgid "Unknown node type"
+msgstr "節點類別不明"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/åŠ å…¥èŠå¤©å®¤(_C)"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Sh_ow"
 msgstr "/好友/顯示(_O)"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/好友/顯示/離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/好友/顯示/空白群組(_E)"
 
-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/好友/顯示/好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/好友/顯示/閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/好友/顯示/通訊協定圖示(_P)"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:3119
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:3121
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3124
+#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
+#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
 msgid "/Accounts/Manage"
 msgstr "/帳號/管理"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:3129
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:3130
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
 msgstr "/工具/憑證(_C)"
 
-#: ../pidgin/gtkblist.c:3131
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:3132
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:3133
+#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:3135
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:3137
+#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:3139
+#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:3141
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: ../pidgin/gtkblist.c:3142
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:3143
+#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
+#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:3176
+#: ../pidgin/gtkblist.c:3128
 #, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>帳號：</b>%s"
+
+#: ../pidgin/gtkblist.c:3136
+#, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>帳號：</b>%s"
+"<b>主題：</b>%s"
 
-#: ../pidgin/gtkblist.c:3254
+#: ../pidgin/gtkblist.c:3136
+msgid "(no topic set)"
+msgstr "（沒有設定主題）"
+
+#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3283
+#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」
-#: ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3352
+#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3693
+#: ../pidgin/gtkblist.c:3329
+msgid "Total Buddies"
+msgstr "好友總數"
+
+#: ../pidgin/gtkblist.c:3696
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "閒置 %d 日 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3695
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3697
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3851
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/åŠ å…¥èŠå¤©å®¤(_C)..."
 
-#: ../pidgin/gtkblist.c:3853
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3857
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4029 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14511,69 +14791,66 @@ msgstr[1] "%d 個由 %s 發出的未讀å
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:4189
+#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:4192
+#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:4193
+#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4535
 #, c-format
 msgid "%s disabled"
 msgstr "%s 已被停用"
 
-#: ../pidgin/gtkblist.c:4489
+#: ../pidgin/gtkblist.c:4539
 msgid "Reconnect"
 msgstr "重新連線"
 
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
 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:4656
+msgid "Welcome back!"
+msgstr "歡迎歸來！"
 
-#: ../pidgin/gtkblist.c:4604
+#: ../pidgin/gtkblist.c:4692
 #, c-format
-msgid "%d account was disabled because you signed on from another location."
+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å€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºæ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºæ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ï¼š"
+msgstr[1] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºæ‚¨ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ï¼š"
 
-#: ../pidgin/gtkblist.c:4831
+#: ../pidgin/gtkblist.c:4971
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4838
+#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4849
+#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4934
+#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4948
+#: ../pidgin/gtkblist.c:5087
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14591,27 +14868,27 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5219
+#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/好友/顯示/離線好友"
 
-#: ../pidgin/gtkblist.c:5222
+#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/好友/顯示/空群組"
 
-#: ../pidgin/gtkblist.c:5228
+#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/好友/顯示/好友細節"
 
-#: ../pidgin/gtkblist.c:5231
+#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
 msgstr "/好友/顯示/閒置時間"
 
-#: ../pidgin/gtkblist.c:5234
+#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/好友/顯示/通訊協定圖示"
 
-#: ../pidgin/gtkblist.c:6166
+#: ../pidgin/gtkblist.c:6324
 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. "
@@ -14621,288 +14898,294 @@ msgstr ""
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6189
+#: ../pidgin/gtkblist.c:6347
 msgid "A_ccount:"
 msgstr "帳號(_C)："
 
 #. End of account box
-#: ../pidgin/gtkblist.c:6201
+#: ../pidgin/gtkblist.c:6359
 msgid "_Screen name:"
 msgstr "帳號(_S)："
 
-#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
+#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
 msgid "A_lias:"
 msgstr "別名(_L)："
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6648
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:6507
+#: ../pidgin/gtkblist.c:6664
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "æ‚¨ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›æ‚¨åŠ å…¥èŠå¤©å®¤çš„é€šè¨Šå”å®šã€‚"
 
-#: ../pidgin/gtkblist.c:6550
+#: ../pidgin/gtkblist.c:6708
 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:6609
-msgid "Autojoin when account becomes online."
-msgstr "å¸³è™Ÿä¸Šç·šå¾Œéš¨å³è‡ªå‹•åŠ å…¥ã€‚"
+#: ../pidgin/gtkblist.c:6738
+msgid "Auto_join when account becomes online."
+msgstr "å¸³è™Ÿä¸Šç·šå¾Œéš¨å³è‡ªå‹•åŠ å…¥(_J)。"
 
-#: ../pidgin/gtkblist.c:6610
-msgid "Hide chat when the window is closed."
-msgstr "關閉視窗時只將聊天隱藏。"
+#: ../pidgin/gtkblist.c:6739
+msgid "_Hide chat when the window is closed."
+msgstr "關閉視窗時只將聊天隱藏(_H)。"
 
-#: ../pidgin/gtkblist.c:6636
+#: ../pidgin/gtkblist.c:6765
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:7282
+#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:7306
+#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3132
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:7327
+#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:7339
+#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:7345
+#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:7394
+#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:7464
+#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:531
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL 伺服器"
 
-#: ../pidgin/gtkconv.c:524
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX æš«è­¯
-#: ../pidgin/gtkconv.c:816
+#: ../pidgin/gtkconv.c:775
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:869
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
+#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:920
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
+#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
+#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1676
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: ../pidgin/gtkconv.c:1699
+#  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
+#  NOTE ä¹ƒã€Œå¿½ç•¥æ ¼å¼ã€çš„æ„æ€ï¼Œæ•…åªèƒ½è­¯æˆã€Œå¿½ç•¥ã€
+#: ../pidgin/gtkconv.c:1668
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1722
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2722
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "å‹•ç•«"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2782
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
-#: ../pidgin/gtkconv.c:2931
+#: ../pidgin/gtkconv.c:2917
 msgid "Show All"
 msgstr "全部顯示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2936
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2938
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2946
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2967
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2969
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2971
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2973
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2977
+#: ../pidgin/gtkconv.c:2963
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2979
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2981
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:2988
 msgid "/_Options"
 msgstr "/é¸é …(_O)"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Enable _Logging"
 msgstr "/é¸é …/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2990
 msgid "/Options/Enable _Sounds"
 msgstr "/é¸é …/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:2992
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/é¸é …/é¡¯ç¤ºæ ¼å¼å·¥å…·åˆ—(_T)"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:2993
 msgid "/Options/Show Ti_mestamps"
 msgstr "/é¸é …/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3120
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3176
 msgid "/Options"
 msgstr "/é¸é …"
 
@@ -14911,247 +15194,252 @@ 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:3225 ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3211 ../pidgin/gtkconv.c:3243
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3251
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3291
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3317
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../pidgin/gtkconv.c:3323
+#: ../pidgin/gtkconv.c:3309
 msgid "/Options/Enable Logging"
 msgstr "/é¸é …/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3326
+#: ../pidgin/gtkconv.c:3312
 msgid "/Options/Enable Sounds"
 msgstr "/é¸é …/開啟音效"
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3325
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/é¸é …/é¡¯ç¤ºæ ¼å¼å·¥å…·åˆ—"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3328
 msgid "/Options/Show Timestamps"
 msgstr "/é¸é …/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3406
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr "對方輸入了一些東西，不過暫停了"
+#: ../pidgin/gtkconv.c:3476
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s 停止輸入訊息給您"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+#: ../pidgin/gtkconv.c:3642 ../pidgin/gtkconv.c:8313
 msgid "S_end To"
 msgstr "傳送到(_E)"
 
-#: ../pidgin/gtkconv.c:4360
+#: ../pidgin/gtkconv.c:4354
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
+#: ../pidgin/gtkconv.c:4492
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
+#: ../pidgin/gtkconv.c:5791 ../pidgin/gtkconv.c:5912
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6539 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6578
+#: ../pidgin/gtkconv.c:6543
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6581
+#: ../pidgin/gtkconv.c:6546
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6549 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6590
+#: ../pidgin/gtkconv.c:6555
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7767
+#: ../pidgin/gtkconv.c:7785
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear：清空所有交談的回捲緩衝區"
 
-#: ../pidgin/gtkconv.c:7930
+#: ../pidgin/gtkconv.c:7989
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7962
+#: ../pidgin/gtkconv.c:8021
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:8581
+#: ../pidgin/gtkconv.c:8654
 msgid "Close other tabs"
 msgstr "é—œé–‰å…¶ä»–åˆ†é "
 
-#: ../pidgin/gtkconv.c:8587
+#: ../pidgin/gtkconv.c:8660
 msgid "Close all tabs"
 msgstr "é—œé–‰æ‰€æœ‰åˆ†é "
 
-#: ../pidgin/gtkconv.c:8595
+#: ../pidgin/gtkconv.c:8668
 msgid "Detach this tab"
 msgstr "åˆ†é›¢é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:8601
+#: ../pidgin/gtkconv.c:8674
 msgid "Close this tab"
 msgstr "é—œé–‰é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:9106
+#: ../pidgin/gtkconv.c:9188
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:9708
+#: ../pidgin/gtkconv.c:9792
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:9710
+#: ../pidgin/gtkconv.c:9794
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkconv.c:9796 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:9714
+#: ../pidgin/gtkconv.c:9798
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:9716
+#: ../pidgin/gtkconv.c:9800
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTEã€Œé™¤éŒ¯æ—¥èªŒã€å¾ˆæ€ªï¼Œã€Œé™¤éŒ¯ç´€éŒ„ã€è¼ƒé †å£ï¼Œè€Œä¸”å·²ç¶“æœ‰äººç”¨
-#: ../pidgin/gtkdebug.c:235
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "反向"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:586
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
 #  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:655
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:780
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:799
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "æŒ‰å³éµä»¥é¡¯ç¤ºæ›´å¤šé¸é …ã€‚"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "全部訊息"
 
 # NOTE 這個不是指「Infoã€ï¼ˆå› ç‚ºå·²ç¶“æœ‰ã€ŒInfoã€ä¸€é …ï¼‰ï¼Œè€Œæ˜¯ä¸€ç¨®æ¯”ã€ŒInfo」還要低層次的除錯訊息，應是指「Debug」
-#: ../pidgin/gtkdebug.c:839
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "閒雜訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:841
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "警告訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:842
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "錯誤訊息"
 
 # TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:843
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "主要開發者"
 
@@ -15164,6 +15452,7 @@ msgstr "主要開發者"
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "開發者"
 
@@ -15175,180 +15464,180 @@ msgstr "支援兼品管"
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "資深貢獻者兼品管"
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:113
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "XMPP 開發者"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "原作者"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "阿拉伯文"
 
 #  NOTE「Latin」係指譯文以「拉丁字母」（而非西里爾字母）書寫，中譯可以省略 - acli 20070918
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr "白俄羅斯文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "ä¿åŠ åˆ©äºžæ–‡"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "å­ŸåŠ æ‹‰æ–‡"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr "波希尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "åŠ æ³°éš†æ–‡"
 
 # NOTE ç›´è­¯æ˜¯ã€Œç“¦å€«è¥¿äºžå¼åŠ æ³°éš†æ–‡ã€ï¼Œä½†æ­£å¸¸çš„å«æ³•æ˜¯ç›´æŽ¥å¯«ã€Œç“¦å€«è¥¿äºžèªžã€(Valencian)
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:235
 msgid "German"
 msgstr "å¾·æ–‡"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "åŠ æ‹¿å¤§å¼è‹±æ–‡"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "愛沙尼亞文"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "French"
 msgstr "法文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:246
 msgid "Galician"
 msgstr "åŠ é‡Œè¥¿äºžæ–‡"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
 msgid "Hebrew"
 msgstr "希伯來文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "印度文"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -15357,58 +15646,58 @@ msgstr "印尼文"
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE è¨»ï¼šå›  zh_TW å’Œ zh_HK 正式分家，還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
 msgid "Georgian"
 msgstr "喬治亞文"
 
 # FIXME 可以譯好一點 20070520 acli
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註：KDE 譯「坎納達」
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "康納達文"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Korean"
 msgstr "韓文"
 
 #  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
 #  NOTE è¨»ï¼šå›  zh_TW å’Œ zh_HK 正式分家，保留台式譯法「庫德」
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "寮國文"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTEã€Œé¦¬å…¶é “æ–‡ã€æ˜¯ä¸€ç¨®æ±æ­èªžæ–‡ï¼Œè·Ÿå¸Œè‡˜çš„é¦¬å…¶é “ä¸¦ç„¡é—œä¿‚
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
 msgid "Macedonian"
 msgstr "é¦¬å…¶é “æ–‡"
 
@@ -15417,56 +15706,60 @@ msgstr "é¦¬å…¶é “æ–‡"
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:195
+msgid "Punjabi"
+msgstr "旁遮普文"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:201
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Russian"
 msgstr "ä¿„æ–‡"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -15474,76 +15767,80 @@ msgstr "斯洛伐克文"
 #  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
 #  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:212
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "æ³°æ–‡"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
+msgid "Urdu"
+msgstr "烏爾都文"
+
+#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:217
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:274
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:368
+#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:411
+#: ../pidgin/gtkdialogs.c:395
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15564,12 +15861,12 @@ msgstr ""
 "作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
 "式恕不提供任何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:429
+#: ../pidgin/gtkdialogs.c:413
 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:434
+#: ../pidgin/gtkdialogs.c:418
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -15577,100 +15874,96 @@ msgstr "現任開發者"
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:433
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:448
 msgid "Retired Developers"
 msgstr "前任開發者"
 
 # NOTE 參見「Crazy Patch Writer」條
-#: ../pidgin/gtkdialogs.c:479
+#: ../pidgin/gtkdialogs.c:463
 msgid "Retired Crazy Patch Writers"
 msgstr "前任的狂熱模組作者"
 
 #  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:494
+#: ../pidgin/gtkdialogs.c:478
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:509
+#: ../pidgin/gtkdialogs.c:493
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:529
+#: ../pidgin/gtkdialogs.c:513
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:547
+#: ../pidgin/gtkdialogs.c:531
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
 # NOTE åªèƒ½è­¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
+#: ../pidgin/gtkdialogs.c:967
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../pidgin/gtkdialogs.c:769
-msgid "Buddy"
-msgstr "好友"
-
-#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:972
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../pidgin/gtkdialogs.c:920
+#: ../pidgin/gtkdialogs.c:899
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:922
+#: ../pidgin/gtkdialogs.c:901
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkdialogs.c:991
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:993
 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:1034
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Alias Contact"
 msgstr "ç‚ºé€™çµ„å¥½å‹åŠ ä¸Šåˆ¥å"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1035
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1036
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1038
 msgid "Alias Buddy"
 msgstr "ç‚ºé€™å€‹å¥½å‹åŠ ä¸Šåˆ¥å"
 
-#: ../pidgin/gtkdialogs.c:1080
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1081
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1120
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15686,32 +15979,32 @@ msgstr[1] ""
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1141
 #, 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:1169
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1172
+#: ../pidgin/gtkdialogs.c:1151
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1201
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15719,42 +16012,42 @@ msgstr ""
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1204
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1207
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1261
+#: ../pidgin/gtkdialogs.c:1240
 #, 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:1264
+#: ../pidgin/gtkdialogs.c:1243
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1267
+#: ../pidgin/gtkdialogs.c:1246
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1288
+#: ../pidgin/gtkdialogs.c:1267
 #, 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:1291
+#: ../pidgin/gtkdialogs.c:1270
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1294
+#: ../pidgin/gtkdialogs.c:1273
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -15767,23 +16060,23 @@ msgstr "變更狀態"
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../pidgin/gtkdocklet.c:680
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:706
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:721
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:728
+#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "有新訊息時閃動"
 
-#: ../pidgin/gtkdocklet.c:738
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "結束程式"
 
@@ -15855,69 +16148,103 @@ msgstr "尚需時間："
 msgid "Time Remaining:"
 msgstr "尚需時間："
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "所有的檔案傳輸完畢時，關閉這個視窗(_F)"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX æš«è­¯
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiwordè­¯ã€Œæœªæ ¼å¼åŒ–è²¼ä¸Šã€ï¼Œè½ä¾†éƒ½æœ‰äº›æ€ª
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–(_R)"
 
-#: ../pidgin/gtkimhtml.c:1359
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1360
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1363
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1364
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "ç•¶æ»‘é¼ ç¶“éŽé€£çµæ™‚çš„é€£çµé¡è‰²ã€‚"
 
-#: ../pidgin/gtkimhtml.c:1581
+#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+#, fuzzy
+msgid "Sent Message Name Color"
+msgstr "送出訊息名稱顏色"
+
+#: ../pidgin/gtkimhtml.c:1400
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
+#, fuzzy
+msgid "Received Message Name Color"
+msgstr "收到訊息名稱顏色"
+
+#: ../pidgin/gtkimhtml.c:1404
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1407
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1408
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1593
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1603
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3353
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15928,7 +16255,7 @@ msgstr ""
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3356
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15938,7 +16265,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3385
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15949,7 +16276,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3388
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15960,15 +16287,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3506
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "選擇字型"
 
@@ -15976,202 +16303,217 @@ msgstr "設定文字顏色"
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:323
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:412
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:427
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "åŠ å…¥é€£çµ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:516
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像：%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "插入影像"
 
+#: ../pidgin/gtkimhtmltoolbar.c:712
+msgid "Smile!"
+msgstr "笑一個！"
+
 #  XXX è­¯æ–‡ä¸é€šé †
-#: ../pidgin/gtkimhtmltoolbar.c:765
+#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:782
-msgid "Smile!"
-msgstr "笑一個！"
-
-#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "å­—åž‹(_F)"
 
 # XXX æš«è­¯
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
 msgstr "建立群組"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr "解除群組"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "ç²—é«”"
 
 # NOTE「Italicã€æœ¬ä¾†æ˜¯æŒ‡æŸç¨‹åº¦ä¸Šæ¨¡ä»¿æ‰‹å¯«ã€ä»¥æ›²ç·šç‚ºä¸»çš„å­—åž‹ï¼Œã€Œæ–œé«”ã€å…¶å¯¦æ˜¯èª¤è­¯ï¼Œä½†å·²æ ¹æ·±è’‚å›ºï¼Œä¸å¯èƒ½æ”¹æ­£
-#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "刪除線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "放大字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Font Face"
 msgstr "å­—åž‹"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1101
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Background Color"
 msgstr "背景顏色"
 
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Foreground Color"
 msgstr "前景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "插入影像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1108
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>ç²—é«”(_B)</b>"
 
 # NOTE「Italicã€æœ¬ä¾†æ˜¯æŒ‡æŸç¨‹åº¦ä¸Šæ¨¡ä»¿æ‰‹å¯«ã€ä»¥æ›²ç·šç‚ºä¸»çš„å­—åž‹ï¼Œã€Œæ–œé«”ã€å…¶å¯¦æ˜¯èª¤è­¯ï¼Œä½†å·²æ ¹æ·±è’‚å›ºï¼Œä¸å¯èƒ½æ”¹æ­£
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>斜體(_I)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>底線(_U)</u>"
 
 #  NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法）
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>刪除線</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>放大(_L)</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
 msgstr "正常(_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 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:1196
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "å­—åž‹(_F)"
 
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "前景顏色(_C)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1198
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "連結(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1287
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "æ©«ç·š(_H)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1309
+#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "笑一個(_S)！"
 
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "日誌刪除失敗"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "請先檢查權限，然後重試。"
+
 #  XXX ä¸é€šé † - ambrose 20070415
-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，與 %1$s 交談的日誌？"
 
-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄，在聊天室「%1$s」交談的日誌？"
 
-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "您確定您要刪除由%s開始記錄的系統日誌？"
 
+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "刪除日誌？"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "刪除日誌..."
+
 #  NOTE 第一個 %s 是聊天室名稱，第二個 %s 是時間
 #: ../pidgin/gtklog.c:453
 #, c-format
@@ -16184,64 +16526,19 @@ msgstr "<span size='larger' weight='bold
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%Y年%m月"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰ç‹€æ…‹æ”¹è®Šè‡³ç³»çµ±æ—¥èªŒã€é¸é …è¢«å•Ÿå‹•æ™‚ï¼Œç³»çµ±äº‹ä»¶æ‰æœƒè¢«è¨˜éŒ„åˆ°ç³»çµ±æ—¥"
-"誌中。"
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr "å³æ™‚è¨Šæ¯åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰å³æ™‚è¨Šæ¯ã€é¸é …è¢«é–‹å•Ÿæ™‚æ‰æœƒè¢«è¨˜éŒ„ã€‚"
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "èŠå¤©å®¤çš„å…§å®¹å°‡åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰çš„èŠå¤©å®¤ã€é¸é …è¢«å•Ÿå‹•æ™‚æ‰æœƒè¢«è¨˜éŒ„ã€‚"
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "找不到日誌"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "瀏覽日誌目錄(_B)"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "全部日誌大小："
-
-#: ../pidgin/gtklog.c:714
+#: ../pidgin/gtkmain.c:399
 #, c-format
-msgid "Conversations in %s"
-msgstr "於 %s 的交談"
-
-#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
-#, c-format
-msgid "Conversations with %s"
-msgstr "與 %s 的交談"
-
-#: ../pidgin/gtklog.c:823
-msgid "System Log"
-msgstr "系統日誌"
-
-#: ../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:400
+#: ../pidgin/gtkmain.c:402
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16270,9 +16567,38 @@ msgstr ""
 "  --display=DISPLAY   使用指定的 X display\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:528
+#  FIXME
+#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
+#: ../pidgin/gtkmain.c:414
 #, c-format
 msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"使用方法： %s [é¸é …]...\n"
+"\n"
+"  -c, --config=DIR    設定檔所在目錄\n"
+"  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -h, --help          顯示輔助訊息並離開\n"
+"  -m, --multiple      允許同時執行多個Pidgin進程\n"
+"  -n, --nologin       不自動登入\n"
+"  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
+"                      哪些帳號，並使用逗號分隔) \n"
+"  -v, --version       顯示版本訊息並離開\n"
+
+#: ../pidgin/gtkmain.c:541
+#, c-format
+msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
@@ -16295,75 +16621,75 @@ 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:718 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:732 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:350
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:403
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
 
-#: ../pidgin/gtknotify.c:546
+#: ../pidgin/gtknotify.c:551
 #, 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:570
+#: ../pidgin/gtknotify.c:575
 #, 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:998
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "ç„¡æ³•é–‹å•Ÿç¶²é "
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1154
+#: ../pidgin/gtknotify.c:1173
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "多個模組將會被卸載。"
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:308
+#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "無法卸載模組"
 
-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:310
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr "目前無法卸載模組，但用戶端下次啟動時模組將被停用。"
 
-#: ../pidgin/gtkplugin.c:417
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16374,7 +16700,7 @@ msgstr ""
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:427
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -16385,11 +16711,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:562
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:625
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -16398,114 +16724,109 @@ msgstr "選擇檔案"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:547
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:574
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:614
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:616
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "é–’ç½®(_I)"
 
-#: ../pidgin/gtkpounce.c:618
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:620
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:622
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:624
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:626
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:673
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:677
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:683
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:685
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:686
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "é è¦½(_V)"
 
-#: ../pidgin/gtkpounce.c:818
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:823
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1266
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "é è¨­"
-
 # XXX 要覆查 - 20061025
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "無法打開表情主題。"
 
 #  NOTE ç›´è­¯ã€Œå®‰è£ä¸»é¡Œã€å¥½åƒå¾ˆç„¡æ£±å…©å¯ï¼ŒåŠ å€‹ã€Œæª”ã€å­—å¥½åƒè¼ƒå¥½
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "安裝主題檔"
 
-#: ../pidgin/gtkprefs.c:698
+#: ../pidgin/gtkprefs.c:646
 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."
@@ -16513,294 +16834,302 @@ msgstr ""
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: ../pidgin/gtkprefs.c:733
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "圖示"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
-#: ../pidgin/gtkprefs.c:896
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "隱藏即時訊息交談視窗"
 
-#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "離開期間"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "åˆ†é "
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "ä½¿ç”¨åˆ†é è¦–çª—é¡¯ç¤ºå³æ™‚è¨Šæ¯å’ŒèŠå¤©(_T)"
 
-#: ../pidgin/gtkprefs.c:933
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "åœ¨åˆ†é ä¸Šé¡¯ç¤ºé—œé–‰éµ(_U)"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "標籤位置(_P)："
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "視窗上方"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "視窗左側"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "視窗右側"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "新交談(_E)："
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "é¡¯ç¤ºæ‰€æ”¶è¨Šæ¯çš„æ ¼å¼åŒ–(_F)"
 
 #  TODO 要覆查 - acli 20070918
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
 msgstr "é—œé–‰åˆ†é æ™‚éš¨å³é—œé–‰åˆ†é å…§æ‰€æœ‰çš„å³æ™‚é€šè¨Š"
 
 #  TODO 要覆查 - acli 20070912
-#: ../pidgin/gtkprefs.c:1002
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "顯示詳細資訊(_D)"
 
-#: ../pidgin/gtkprefs.c:1004
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:1011
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:1023
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "最小化所有新交談視窗(_Z)"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "å­—åž‹"
 
 #  XXX 要覆查 - acli 20070614
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "使用主題指定的文件字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "交談用的字型(_F)："
 
-#: ../pidgin/gtkprefs.c:1047
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "é è¨­æ ¼å¼"
 
 # NOTE 這不是說明文，而是樣本本身，玩死人了 :P
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "é€™æ˜¯ä¸€å€‹æ¨£æœ¬ã€‚å‡å¦‚æ‚¨ä½¿ç”¨çš„å”å®šæ”¯æ´æ ¼å¼åŒ–ï¼Œé€å‡ºè¨Šæ¯çš„å¼æ¨£å°‡æœƒé¡žä¼¼é€™æ®µæ–‡å­—ã€‚"
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "無法啟動代理伺服器設定程式。"
 
-#: ../pidgin/gtkprefs.c:1138
+#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "無法啟動瀏覽器設定程式。"
 
-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
 
-#: ../pidgin/gtkprefs.c:1214
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1161
+msgid "_Enable automatic router port forwarding"
+msgstr "å•Ÿç”¨è·¯ç”±å™¨çš„è‡ªå‹•é€£æŽ¥åŸ è½‰é€(_E)"
+
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "è‡ªå®šé€šè¨ŠåŸ ç›£è½ç¯„åœ(_M)"
 
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "å•Ÿå§‹é€šè¨ŠåŸ (_S)："
 
-#: ../pidgin/gtkprefs.c:1227
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "çµæŸé€šè¨ŠåŸ (_E)："
 
-#: ../pidgin/gtkprefs.c:1235
+#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>找不到代理伺服器設定程式。</b>"
 
-#: ../pidgin/gtkprefs.c:1251
+#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>找不到瀏覽器設定程式。</b>"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "設定代理伺服器(_P)"
 
-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "設定瀏覽器(_B)"
 
-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE ç†ç”±åŒå‰ï¼Œä¸ç”¨ã€Œæ¯‹é ˆã€ï¼Œæ”¹ç‚ºã€Œä¸ä½¿ç”¨ã€
-#: ../pidgin/gtkprefs.c:1279
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "æ¡Œé¢é è¨­å€¼"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
-msgstr "GNOMEé è¨­"
+msgstr "GNOMEé è¨­å€¼"
 
-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: ../pidgin/gtkprefs.c:1506
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O)："
 
-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "ç€è¦½å™¨é è¨­"
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1511
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "æ–°åˆ†é "
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16809,63 +17138,63 @@ msgstr ""
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "æ—¥èªŒæ ¼å¼(_F)："
 
-#: ../pidgin/gtkprefs.c:1571
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1573
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1743
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1745
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1747
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1822
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16874,203 +17203,202 @@ msgstr ""
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1857
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1859
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "ä»¥éµç›¤åŠæ»‘é¼ çš„ä½¿ç”¨ç‚ºåŸºæº–"
 
-#: ../pidgin/gtkprefs.c:2042
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:2046
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:2054
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:2089
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:2134
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2136
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2143
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2147
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "拒絕所有使用者"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: ../pidgin/gtkprivacy.c:384
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:396
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "帳號："
 
-#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "全部移除(_L)"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您？"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎？"
 
-#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s？"
 
-#: ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s？"
 
-#: ../pidgin/gtkrequest.c:322
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1651
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1652
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: ../pidgin/gtkrequest.c:1655
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1656
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "聊天室清單"
-
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:756
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "新增聊天室(_A)"
 
@@ -17079,85 +17407,85 @@ msgstr "您確定您要刪除被選取çš
 msgstr "您確定您要刪除被選取的狀態？"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "ç›®å‰æ¨™é¡Œæ­£åœ¨ä½¿ç”¨ä¸­ã€‚æ‚¨å¿…é ˆé¸å–ä¸€å€‹å”¯ä¸€çš„æ¨™é¡Œã€‚"
 
 # TODO - 這個有點不妥，但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:976
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1165
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "狀態(_S)："
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1488
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "新增狀態..."
 
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "狀態清單..."
 
-#: ../pidgin/gtkutils.c:634
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1501
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1585
 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."
@@ -17165,23 +17493,23 @@ msgstr ""
 "æ‚¨å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€å½±åƒæª”"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1555
+#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -17189,7 +17517,7 @@ msgstr ""
 "æ‚¨å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€å½±åƒæª”çµ¦é€™å€‹ä½¿ç”¨"
 "者。"
 
-#: ../pidgin/gtkutils.c:1556
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17202,17 +17530,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:1615
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 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:2350
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17223,25 +17551,25 @@ msgstr ""
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2646
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2649
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2749
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2798
+#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17279,6 +17607,11 @@ msgstr "開啟郵件(_O)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+#  FIXME Tooltip中文怎寫？
+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "Pidgin Tooltip"
+
 # NOTE 這是「Default」表情主題的說明
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
@@ -17298,38 +17631,34 @@ msgstr "ç„¡"
 msgid "none"
 msgstr "ç„¡"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "顯示統計資料"
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "統計設定"
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限："
 
-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "分鐘"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "精密度："
 
@@ -17339,18 +17668,18 @@ msgstr "精密度："
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬æ¨¡çµ„"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
+#: ../pidgin/plugins/cap/cap.c:900
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -17438,41 +17767,41 @@ msgstr "自訂交談視窗內各種顏è‰
 msgid "Customize colors in the conversation window"
 msgstr "自訂交談視窗內各種顏色的使用"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "錯誤訊息"
 
 # XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "反白訊息"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "系統訊息"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "送出訊息"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "收到訊息"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
+#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "å¿½ç•¥æ”¶åˆ°è¨Šæ¯ä¸­çš„è‡ªè¨‚æ ¼å¼"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "適用於聊天室"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "適用於即時訊息"
 
@@ -17986,54 +18315,60 @@ msgstr ""
 "- 它會將所有收到的訊息左右掉轉\n"
 "- 它會在您的好友登入時，立刻送出一個訊息給他們"
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "游標顏色"
 
 #  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "第二游標顏色"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
 #: ../pidgin/plugins/pidginrc.c:54
+#, fuzzy
+msgid "Highlighted Message Name Color"
+msgstr "反白訊息名稱顏色"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
 #  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -18057,36 +18392,36 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "å­—åž‹"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:543
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -18162,62 +18497,62 @@ msgstr "改正列表內經已存有您æ‰
 msgid "The specified word already exists in the correction list."
 msgstr "改正列表內經已存有您所指定的字詞。"
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "當您輸入"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "將會送出"
 
 # XXX 譯文有待改進 - 20061027
-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "只匹配完整字詞"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "åŠ å…¥ä¸€å€‹æ–°çš„æ–‡å­—å–ä»£è¦å‰‡"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "當您輸入(_T)："
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "將會送出(_S)："
 
 #  XXX åŠ ã€Œé ˆã€å­—æ„æ€è¼ƒç‚ºæ¸…æ¥š - ambrose 20070415
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "å¤§å°å¯«é ˆå®Œå…¨ä¸€è‡´ï¼ˆä¸é¸å–ç‚ºè‡ªå‹•å¤§å°å¯«è™•ç†ï¼‰(_E)"
 
-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "只取代完整的字(_W)"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "ä¸€èˆ¬æ–‡å­—å–ä»£é¸é …"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2372
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -18239,7 +18574,7 @@ msgstr "好友清單的水平捲動版æœ
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "æ™‚é–“æˆ³è¨˜é¡¯ç¤ºé »çŽ‡"
 
@@ -18249,19 +18584,19 @@ msgstr "æ™‚é–“æˆ³è¨˜é¡¯ç¤ºé »çŽ‡"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "時間戳記"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "顯示 iChat 式的時間戳記"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "每隔 N 分鐘顯示 iChat é¢¨æ ¼çš„æ™‚é–“æˆ³è¨˜ã€‚"
 
@@ -18485,6 +18820,71 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid ""
+#~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+#~ "username and choose a username and try to login again."
+#~ msgstr ""
+#~ "請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+#~ "選擇一個使用者名稱後，再嘗試重新登入。"
+
+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "只在我的狀態不為「上線」時啟用"
+
+#~ msgid ""
+#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
+#~ "supported by MySpace."
+#~ msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是 %d 個字元長。"
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "使用「Recent Buddies」群組"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "顯示您閒置多久時間"
+
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "無法找到或存取 ~/.silc 目錄"
+
+# 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"
+#~ msgid "Current media"
+#~ msgstr "正在播放"
+
+#~ msgid "User has typed something and stopped"
+#~ msgstr "對方輸入了一些東西，不過暫停了"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "%s has typed something and stopped"
+#~ msgstr "對方輸入了一些東西，不過暫停了"
+
+#, fuzzy
+#~ msgid "S_mile!"
+#~ msgstr "笑一個！"
+
+#~ msgid "Display Statistics"
+#~ msgstr "顯示統計資料"
+
+#~ msgid "%s changed status from %s to %s"
+#~ msgstr "%s 從「%s」狀態改變為「%s」"
+
+#~ msgid "%s is now %s"
+#~ msgstr "%s 目前為%s"
+
+#~ msgid "%s is no longer %s"
+#~ msgstr "%s 不再%s"
+
+#~ msgid "Invalid chat name specified."
+#~ msgstr "給予了無效的聊天室名稱。"
+
+#~ msgid ""
+#~ "Always use ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
+#~ "（較慢，但不會暴露您的 IP 位址）"
+
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "卸載模組途中遭遇錯誤。"
 
@@ -18600,10 +19000,6 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 #~ msgid "Socket send error"
 #~ msgstr "寫入 Socket 途中發生錯誤"
 
-# XXX - 20061027
-#~ msgid "Connection refused"
-#~ msgstr "連線被拒"
-
 #~ msgid "Would like to add him?"
 #~ msgstr "æ‚¨æƒ³å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥åˆ°æ‚¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
@@ -19011,13 +19407,6 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 #~ msgid "_Deny"
 #~ msgstr "拒絕(_D)"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s：</b>%s"
-
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>別名：</b>%s<br>"
 
@@ -19173,10 +19562,6 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 #~ msgid "The user %s wants to add %s to his or her buddy list%s%s."
 #~ msgstr "使用者 %s 想要將 %s åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®%s%s。"
 
-#  XXX
-#~ msgid "Message (optional) :"
-#~ msgstr "訊息（可以不填）："
-
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
@@ -19207,13 +19592,6 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 #~ msgid "Invalid username or password"
 #~ msgstr "使用者名稱或密碼無效"
 
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸\n"
-#~ "（較慢，但不會暴露您的 IP 位址）"
-
 #~ msgid "Invalid username."
 #~ msgstr "使用者名稱無效。"
 
@@ -19482,9 +19860,6 @@ msgstr "幫助為 XMPP 伺服器或客æˆ
 #~ msgid "Re-type Passphrase"
 #~ msgstr "再次輸入密碼"
 
-#~ msgid "%s came back"
-#~ msgstr "%s 回來了"
-
 #~ msgid "%s went away"
 #~ msgstr "%s 已經離開"