im.pidgin.pidgin: 79fddfcecc8db6e147a59f1f909bbaa9945b8c2a

[acli at ada.dhs.org]

-----------------------------------------------------------------
Revision: 79fddfcecc8db6e147a59f1f909bbaa9945b8c2a
Ancestor: cdf52b5277a86a98fed917e2a6a51e3c9c8b8784
Author: acli at ada.dhs.org
Date: 2007-11-16T03:39:04
Branch: im.pidgin.pidgin

Modified files:
        po/ChangeLog po/zh_HK.po

ChangeLog: 

fixes #3979

-------------- next part --------------
============================================================
--- po/ChangeLog	b95d7e708a239a0afa2cf02417b80ef541824ab7
+++ po/ChangeLog	6582f2443435b471c2b1c34a415cf65feb25ab02
@@ -1,9 +1,10 @@ version 2.3.0
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.3.0
 	* Afrikaans translation added (Friedel Wolff)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
 	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Estonian translation updated (Ivar Smolin)
============================================================
--- po/zh_HK.po	da9529c8caea3b55cd440c1643e0eeb63bb04801
+++ po/zh_HK.po	d2a656ec2a34ed1d49044277959e226fb88c61cf
@@ -1,62 +1,63 @@
 # Pidgin's Chinese (Hong Kong) 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) 2007, Abel Cheung <abelcheung at gmail.com>
 #
 # 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 $
 #
 # ----------------------------------------------------------
 # For internal use only:
-# FIXME 表示發現了問題，遲早要解決
-# NOTE  表示翻譯有困難，解決了，但不寫下會不明白為什麼這樣譯
-# TODO  表示發現了問題，但不知如何解決
-# XXX   表示可能有問題，要複查；有問題需討論
-# ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
+# FIXME 表示發現了問題，遲早要解決
+# NOTE  表示翻譯有困難，解決了，但不寫下會不明白為什麼這樣譯
+# TODO  表示發現了問題，但不知如何解決
+# XXX   表示可能有問題，要複查；有問題需討論
+# ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
 # ----------------------------------------------------------
-# 注意： screen name = user name = 帳號 = 使用者名稱
-#        screen name 和 user name 在意義上是沒有分別的！
-# 理據如下
-# (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
+# 注意： screen name = user name = 帳號 = 使用者名稱
+#        screen name 和 user name 在意義上是沒有分別的！
+# 理據如下
+# (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
-# SILCå•é¡Œï¼šä¼¼ä¹Žè‡ºç£å’Œé¦™æ¸¯çš„ã€Œå¯†ç¢¼å­¸ã€è¡“èªžç›¸å·®ç”šé ï¼Œå¾ˆé ­ç—› (^^;)
-# - Key æš«è­¯ã€Œå¯†é‘°ã€ï¼ŒåŽŸå› ï¼šã€ŒKey Exchange」既有譯文為「交換密鑰」
-# - Public Key 暫譯「公鑰」
-# - Private Key 暫譯「私鑰」
-# - Key Agreement 與 Key Exchange 似乎同義，譯「交換密鑰」
-# - Passphrase 譯「密碼」
-# (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
-# 另有 SILC 術語：
-# - Private Group 係聊天室內的一種小圈子，譯無可譯之下，暫譯「小圈子」 (XXX)
-# - KE Group 即 Key Exchange Group, 暫譯「密鑰交換群組」，有可能是誤譯 (TODO)
-# - Kill 意為 Remove client from network, 暫直譯「從網路上移除」 (XXX)
-# - Detach 意即跟伺服器停止連線，但不登出，暫譯「暫停連線」
-#   - Detach 的相反詞 Resume 暫譯「恢復連線」
-# - Watch 暫時意譯「伺服器端的好友狀態捕捉」
-# - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
+# SILC問題：似乎臺灣和香港的「密碼學」術語相差甚遠，很頭痛 (^^;)
+# - Key 暫譯「密鑰」，原因：「Key Exchange」既有譯文為「交換密鑰」
+# - Public Key 暫譯「公鑰」
+# - Private Key 暫譯「私鑰」
+# - Key Agreement 與 Key Exchange 似乎同義，譯「交換密鑰」
+# - Passphrase 譯「密碼」
+# (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
+# 另有 SILC 術語：
+# - Private Group 係聊天室內的一種小圈子，譯無可譯之下，暫譯「小圈子」 (XXX)
+# - KE Group 即 Key Exchange Group, 暫譯「密鑰交換群組」，有可能是誤譯 (TODO)
+# - Kill 意為 Remove client from network, 暫直譯「從網路上移除」 (XXX)
+# - Detach 意即跟伺服器停止連線，但不登出，暫譯「暫停連線」
+#   - Detach 的相反詞 Resume 暫譯「恢復連線」
+# - Watch 暫時意譯「伺服器端的好友狀態捕捉」
+# - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
 #
-# FIXME 未有統一譯法的字詞：Buddy List, Postal code、Profile、match、connect、user info
-# FIXME「such」應為「斯」，即「這個」，但目前譯文沒有統一
-# NOTE  中文統一用「」引號；URL、指令等該用 '/" 者除外
-# NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖)，現在不分了
-# NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫，有時用封鎖比較好。
-# NOTE  MSN6.0中文版對「Block」一詞的譯文為「封鎖」
-# XXX   Stream 暫譯「串流」，應該不是「通道」
-# NOTE  nplurals 重設為 2ï¼Œå› ç‚ºéƒ¨åˆ†åŽŸæ–‡è¦åˆ†è¾¨ä¾‹å¦‚ã€Œå®ƒã€åŠã€Œå®ƒå€‘ã€ä¸€é¡žçš„å­—çœ¼
-# NOTE 所有語文名稱（除「世界語」外）一概譯成「XX文」，不譯「XXèªžã€ï¼Œå› ç‚ºå¯«ä¸‹çš„æ˜¯æ–‡ï¼Œä¸æ˜¯èªž
+# FIXME 未有統一譯法的字詞：Buddy List, Postal code、Profile、match、connect、user info
+# FIXME「such」應為「斯」，即「這個」，但目前譯文沒有統一
+# NOTE  中文統一用「」引號；URL、指令等該用 '/" 者除外
+# NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖)，現在不分了
+# NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫，有時用封鎖比較好。
+# NOTE  MSN6.0中文版對「Block」一詞的譯文為「封鎖」
+# XXX   Stream 暫譯「串流」，應該不是「通道」
+# NOTE  nplurals 重設為 2，因為部分原文要分辨例如「它」及「它們」一類的字眼
+# NOTE 所有語文名稱（除「世界語」外）一概譯成「XX文」，不譯「XX語」，因為寫下的是文，不是語
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-05-24 06:43+0800\n"
-"Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
+"Project-Id-Version: Pidgin 2.3.0\n"
+"POT-Creation-Date: 2007-11-12 03:23-0500\n"
+"PO-Revision-Date: 2007-11-15 22:22+0800\n"
+"Last-Translator: Ambrose C. Li <acli at ada.dhs.org>, Paladin R. Liu "
+"<paladin at ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community at linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #  NOTE Untranslated
@@ -91,34 +92,32 @@ msgstr ""
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
-msgstr ""
-"%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
-"並透過 http://developer.pidgin.im åŒ¯å ±é€™å€‹éŒ¯èª¤ã€‚"
+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:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
 
-# FIXME 譯文有待改進 - 20061028
+# FIXME 譯文有待改進 - 20061028
 #: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "帳號未被新增"
@@ -137,14 +136,14 @@ msgid "There's no protocol plugins insta
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "未有安裝任何協定模組。"
 
 #: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "（大概是忘記了執行「make install」了。）"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -175,32 +174,36 @@ msgstr "別名："
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../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
+#: ../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:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/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/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -211,60 +214,60 @@ msgstr "別名："
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../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
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../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:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "ä½ ç¢ºå®šè¦åˆªé™¤ %s？"
@@ -275,16 +278,16 @@ msgstr "刪除帳號"
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -294,53 +297,54 @@ msgstr "以下列表的帳號可隨意å•
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2379
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6638 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "åŠ å…¥"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s åŠ å…¥äº† %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "å°‡ä½¿ç”¨è€…åŠ å…¥ä½ çš„å¥½å‹æ¸…å–®ï¼Ÿ"
 
-#  NOTE: æœ€é ­çš„ %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
-#  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
+#  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®%s%s。"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "給予認證"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "拒絕"
 
@@ -364,20 +368,21 @@ msgstr "新增好友途中發生了錯èª
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "帳號"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "別名"
 
@@ -386,44 +391,49 @@ msgstr "羣組"
 msgstr "羣組"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../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
 msgid "Account"
 msgstr "帳號"
 
 #: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6140
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
 
-# TODO 要覆查 - 20061025
+# TODO 要覆查 - 20061025
 #: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "聊天"
 
-# NOTE åªèƒ½è­¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
+# NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -433,7 +443,7 @@ msgstr "è‡ªå‹•åŠ å…¥"
 msgid "Auto-join"
 msgstr "è‡ªå‹•åŠ å…¥"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
 msgid "Add Chat"
 msgstr "新增聊天室"
 
@@ -453,14 +463,14 @@ msgstr "那個羣組已經存在"
 msgid "A group with the name already exists."
 msgstr "那個羣組已經存在"
 
-# TODO è«‹è¦†æŸ¥æ ¸å¯¦ï¼šæ˜¯ã€ŒåŠ å…¥ã€æŠ‘æˆ–ã€Œæ–°å¢žã€?
+# TODO 請覆查核實：是「加入」抑或「新增」?
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
 msgid "Add Group"
 msgstr "åŠ å…¥ç¾£çµ„"
 
-# TODO 要覆查 - 20061026
+# TODO 要覆查 - 20061026
 #: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "請給羣組輸入名稱。"
@@ -473,12 +483,12 @@ msgstr "請按需要更新欄位內的è³
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-# TODO 要覆查 - 20061025
+# TODO 要覆查 - 20061025
 #: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "修改"
 
-# XXX é‚„æ˜¯ã€Œä¿®æ”¹é¸é …ã€ï¼Ÿ
+# XXX 還是「修改選項」？
 #: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "修改設定"
@@ -492,8 +502,8 @@ msgstr "讀取中..."
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
@@ -503,10 +513,10 @@ msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰"
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -527,7 +537,7 @@ msgstr "設定別名"
 msgid "Set Alias"
 msgstr "設定別名"
 
-# FIXME 譯文有待改進 - 20061029
+# FIXME 譯文有待改進 - 20061029
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
@@ -551,20 +561,20 @@ msgstr "確認移除"
 msgstr "確認移除"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
 
 # 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
+# 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
 msgid "Place tagged"
 msgstr "ç§»å‹•å·²æ¨™è¨˜çš„é …ç›®"
@@ -575,51 +585,55 @@ msgstr "切換標記"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/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/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "網名"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "é–’ç½®"
 
 #: ../finch/gntblist.c:1334
-#, fuzzy
 msgid "On Mobile"
-msgstr "使用流動通訊器材"
+msgstr "使用流動通訊器材中"
 
 #: ../finch/gntblist.c:1415
 #, c-format
@@ -645,39 +659,26 @@ msgstr ""
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "新增..."
 
-# NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
-# NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+# NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
+# NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "模組清單"
 
-# NOTE åªèƒ½è­¯ã€Œåç¨±ã€ï¼Œå› ç‚ºåŒæ™‚è§£ä½œã€Œäººåã€åŠã€Œæ¨¡çµ„åç¨±ã€
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "帳號(_A)"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦ç™¼é€å³æ™‚è¨Šæ¯å°è±¡çš„å¸³è™Ÿã€‚"
@@ -685,83 +686,114 @@ msgstr "è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦ç™¼é€å³æ™
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../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
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/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/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../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
 msgid "OK"
 msgstr "確定"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "é »é“"
+
+# TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
+# NOTE 譯文更動 by Paladin
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "åŠ å…¥èŠå¤©å®¤"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "è«‹è¼¸å…¥ä½ æƒ³è¦åŠ å…¥çš„èŠå¤©å®¤çš„åç¨±ã€‚"
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "åŠ å…¥"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "é¸é …"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "æ ¹æ“šç¾£çµ„"
+#: ../finch/gntblist.c:2335
+msgid "Join Chat..."
+msgstr "åŠ å…¥èŠå¤©å®¤..."
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "顯示離線好友"
+#: ../finch/gntblist.c:2340
+msgid "Show"
+msgstr "顯示"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "æ ¹æ“šç‹€æ…‹æŽ’åˆ—"
+#: ../finch/gntblist.c:2345
+msgid "Empty groups"
+msgstr "空的羣組"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "æ ¹æ“šå­—æ¯æŽ’åˆ—"
+#: ../finch/gntblist.c:2352
+msgid "Offline buddies"
+msgstr "離線好友"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "æ ¹æ“šæ—¥èªŒå¤§å°æŽ’åˆ—"
+#: ../finch/gntblist.c:2359
+msgid "Sort"
+msgstr "排序"
 
+#: ../finch/gntblist.c:2364
+msgid "By Status"
+msgstr "æ ¹æ“šç…§ç‹€æ…‹"
+
+#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "æ ¹æ“šç…§å­—æ¯"
+
+#: ../finch/gntblist.c:2374
+msgid "By Log Size"
+msgstr "æ ¹æ“šç…§æ—¥èªŒå¤§å°"
+
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "é€£ç·šåŸ "
+msgstr "匯入證書"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "請指定主機名稱"
 
+# XXX 譯文有待改進 - acli 20070913
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "請輸入這張證書所屬的主機名稱。"
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
@@ -769,19 +801,20 @@ msgstr ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"無法匯入檔案「%s」。\n"
+"請檢查檔案是否可讀及是否為 PEM æ ¼å¼ã€‚\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "證書匯入錯誤"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 證書匯入失敗"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "選擇檔案"
+msgstr "選擇PEM證書"
 
 #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
@@ -789,23 +822,25 @@ msgstr ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"無法匯出至檔案「%s」。\n"
+"è«‹ç¢ºå®šä½ æœ‰æ¬Šé™å¯«å…¥ç›®æ¨™æª”\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "證書匯出錯誤"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 證書匯出失敗"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "匯出 X.509 證書"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "狀態：%s"
+msgstr "%s 的證書"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -815,61 +850,66 @@ msgstr ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"全名：%s\n"
+"\n"
+"SHA1 指紋：\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL 主機證書"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "確定要刪除 %s 的證書？"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "確定刪除證書"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
-msgstr ""
+msgstr "證書管理"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "主機名稱"
 
-# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
-# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+# 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
 msgid "Info"
 msgstr "資訊"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../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
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "關閉"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#: ../finch/gntconn.c:129
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -877,53 +917,53 @@ msgstr ""
 "and re-enable the account."
 msgstr ""
 "%s\n"
-"åœ¨ä½ æ›´æ­£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼Œ%s 將不會再嘗試重新連線。"
+"\n"
+"åœ¨ä½ æ›´æ­£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼ŒFinch 將不會再嘗試重新連線。"
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "æŒ‡ä»¤åŸ·è¡Œå¤±æ•—ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: ../finch/gntconv.c:168
-#, fuzzy
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
-msgstr "å› ç‚ºæˆ‘å€‘å‚³é€è¨Šæ¯çš„é€Ÿåº¦å¤ªå¿«ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
+msgstr "å› ç‚ºä½ ä¸¦æœªç™»å…¥ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
-# XXX 這是什麼？
-#: ../finch/gntconv.c:251
+# XXX 這是什麼？
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -932,67 +972,65 @@ msgstr ""
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "ä½ é›¢é–‹äº†èŠå¤©å®¤ã€‚"
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
-msgstr "/é¸é …/開始記錄日誌"
+msgstr "開始記錄日誌"
 
-#: ../finch/gntconv.c:533
-#, fuzzy
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
-msgstr "啟動音效："
+msgstr "啟動音效"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "æ”¯æ´çš„é™¤éŒ¯é¸é …æœ‰ï¼šversion"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1000,60 +1038,65 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;é¸é …&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users：顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "無法開啟檔案。"
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -1061,15 +1104,15 @@ 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:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "過濾器："
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "暫停"
 
@@ -1106,25 +1149,27 @@ msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:362
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../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:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "狀態"
 
@@ -1140,7 +1185,7 @@ msgstr "中止"
 msgid "Stop"
 msgstr "中止"
 
-#  XXX æš«è­¯
+#  XXX 暫譯
 #: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
@@ -1153,22 +1198,24 @@ msgstr "失敗"
 msgid "Failed"
 msgstr "失敗"
 
+#  XXX pending Paladin's confirmation - acli 20070713
 #: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "成功存檔至 %s。"
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -1176,74 +1223,70 @@ msgstr "電子郵件"
 msgid "Emails"
 msgstr "電子郵件"
 
-# XXX 要覆查
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+# XXX 要覆查
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "ä½ æ”¶åˆ°éƒµä»¶ï¼"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "繼續"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "åŠ å…¥"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "邀請"
 
-# TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:395
+# TODO 要覆查 - 20061028
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "錯誤"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "模組載入失敗"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "模組卸載失敗"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1260,19 +1303,40 @@ msgstr ""
 "網站：%s\n"
 "檔名：%s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前，請先載入模組。"
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "æ­¤æ¨¡çµ„ä¸¦ç„¡é¸é …å¯ä¾›è¨­å®šã€‚"
 
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "載入模組途中遭遇錯誤"
+
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "所指定的檔案不是有效的模組。"
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr "請開啟「除錯視窗」檢視確實的錯誤訊息。"
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "請選擇希望安裝的模組"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "ä½ å¯é€éŽä»¥ä¸‹åˆ—è¡¨è¼‰å…¥æˆ–å¸è¼‰æ¨¡çµ„ã€‚"
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "安裝模組..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "設定模組"
 
@@ -1281,191 +1345,188 @@ msgstr "設定模組"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "帳號："
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "登入"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "登出"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "返回"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "é–’ç½®"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "執行動作"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "開啟即時訊息視窗"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "彈出通知"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "送出訊息"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "執行指令"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
-msgstr "重複發生"
+msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
-msgstr "無法更改網名"
+msgstr "無法新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:619
-#, fuzzy
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
-msgstr "å¿…é ˆæŒ‡å®šå¸³è™Ÿ"
+msgstr "未有設定任何帳號"
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "æ–°å¢žå¥½å‹ç‹€æ…‹æ•æ‰å‰ï¼Œå¿…é ˆå…ˆæ–°å¢žä¸€å€‹å¸³è™Ÿã€‚"
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "ä½ ç¢ºå®šä½ è¦åˆªé™¤å° %2$s çš„ %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s é–‹å§‹è¼¸å…¥è¨Šæ¯çµ¦ä½  (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s æš«åœè¼¸å…¥è¨Šæ¯çµ¦ä½  (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s åœæ­¢è¼¸å…¥è¨Šæ¯çµ¦ä½  (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 更改狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
-# XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+# XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s é€å‡ºä¸€å€‹è¨Šæ¯çµ¦ä½ ã€‚ (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
 msgstr "æœªçŸ¥çš„æ•æ‰äº‹ä»¶ã€‚è«‹åŒ¯å ±é€™å€‹å•é¡Œï¼"
 
@@ -1473,12 +1534,12 @@ msgstr "以鍵盤的使用為基準"
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
@@ -1512,207 +1573,193 @@ msgstr "記錄所有的狀態改變"
 msgstr "記錄所有的狀態改變"
 
 #: ../finch/gntprefs.c:207
-#, fuzzy
 msgid "Report Idle time"
 msgstr "閒置時間基準(_R)"
 
 #: ../finch/gntprefs.c:208
-#, fuzzy
 msgid "Change status when idle"
-msgstr "閒置時更改狀態(_I)"
+msgstr "閒置時更改狀態"
 
-# NOTE 譯文更動 by Ambrose
 #: ../finch/gntprefs.c:209
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "閒置多少分鐘設為離開(_M)："
+msgstr "閒置多少分鐘更改狀態"
 
 #: ../finch/gntprefs.c:210
-#, fuzzy
 msgid "Change status to"
-msgstr "更改狀態為(_S)："
+msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "收到訊息"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "訊息收到，開始進行交談"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "ä½ åœ¨èŠå¤©å®¤èªªè©±"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "æœ‰äººåœ¨èŠå¤©å®¤ä¸­æåˆ°ä½ çš„åå­—"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(é è¨­)"
 
 #: ../finch/gntsound.c:729
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "選擇資料匣..."
+msgstr "選擇音效檔..."
 
 #: ../finch/gntsound.c:904
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "偏好設定"
+msgstr "音效設定"
 
 #: ../finch/gntsound.c:915
-#, fuzzy
 msgid "Profiles"
 msgstr "個人資料"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "自動"
 
 #: ../finch/gntsound.c:957
-#, fuzzy
 msgid "Console Beep"
 msgstr "嗶一聲"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "指令"
 
 #: ../finch/gntsound.c:959
-#, fuzzy
 msgid "No Sound"
 msgstr "無音效"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "音效播放方式"
 
 #: ../finch/gntsound.c:966
-#, fuzzy
 msgid "Method: "
-msgstr "播放方式(_M)："
+msgstr "播放方式："
 
 #: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"音效指令(_C)：\n"
+"音效指令：\n"
 "(請以 %s 代表檔名)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "éŸ³æ•ˆé¸é …"
 
 #: ../finch/gntsound.c:982
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "當交談取得輸入焦點發出音效(_F)"
+msgstr "當交談取得輸入焦點發出音效"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "務必"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "離開期間"
 
 #: ../finch/gntsound.c:999
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "音量："
+msgstr "音量(0-100)："
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "事件"
 
 #: ../finch/gntsound.c:1020
-#, fuzzy
 msgid "File"
-msgstr "失敗"
+msgstr "檔案"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "測試"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "重置"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "選擇..."
 
@@ -1725,21 +1772,22 @@ msgstr "移除狀態"
 msgid "Delete Status"
 msgstr "移除狀態"
 
-# FIXME 譯得太差了
+# FIXME 譯得太差了
 #: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
-# FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è­¯
+# FIXME 原文一詞兩義，根本無法翻譯
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "職銜"
 
-# NOTE æ‡‰æŒ‡å„²å­˜æ™‚çš„æ ¼å¼
+# NOTE 應指儲存時的格式
 #: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "æ ¼å¼"
@@ -1753,41 +1801,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:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:274
+#: ../libpurple/protocols/bonjour/bonjour.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../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/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:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "訊息"
 
@@ -1806,7 +1857,7 @@ msgid "Duplicate title"
 
 #: ../finch/gntstatus.c:310
 msgid "Duplicate title"
-msgstr "標題重複"
+msgstr "標題重覆"
 
 #: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
@@ -1839,9 +1890,9 @@ msgid "Certificates"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "證書"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "音效"
 
@@ -1851,23 +1902,20 @@ msgstr "狀態"
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "卸載模組途中遭遇錯誤。"
+msgstr "載入模組途中遭遇錯誤。"
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "無法開啟檔案"
+msgstr "找不到 X Display 的設定"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "無法開啟檔案"
+msgstr "無法找到視窗"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "ç„¡æ³•è¼‰å…¥æ¨¡çµ„ï¼Œå› ç‚ºå»ºç½®æ¨¡çµ„æ™‚æ²’æœ‰çµ¦å®ƒåŠ å…¥ X11 支援。"
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1877,12 +1925,12 @@ msgstr "剪貼簿模組"
 msgid "Clipboard plugin"
 msgstr "剪貼簿模組"
 
-#  FIXME: é€™å¾ˆä¸é€šé †
+#  FIXME: 這很不通順
 #: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "當 gnt 的剪貼薄內容有所更改時，儘可能把新的內容匯出至 X 視窗系統。"
+msgstr "當 gnt 的剪貼簿內容有所更改時，儘可能把新的內容匯出至 X 視窗系統。"
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1925,7 +1973,7 @@ msgstr "æœ‰äººåœ¨èŠå¤©å®¤ä¸­æåˆ°ä½ çš
 msgid "Someone says your name in a chat"
 msgstr "æœ‰äººåœ¨èŠå¤©å®¤ä¸­æåˆ°ä½ çš„åå­—"
 
-#  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN é¢¨æ ¼çš„å½ˆå‡ºå¼é€šçŸ¥å¥½åƒå¤šå£«çˆå½ˆå‡ºçƒ˜å¥½çš„éºµåŒ…ä¸€æ¨£
+#  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
 #: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
@@ -1942,21 +1990,21 @@ msgstr "GntGf"
 msgid "GntGf"
 msgstr "GntGf"
 
-#  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN é¢¨æ ¼çš„å½ˆå‡ºå¼é€šçŸ¥å¥½åƒå¤šå£«çˆå½ˆå‡ºçƒ˜å¥½çš„éºªåŒ…ä¸€æ¨£
+#  NOTE「GntGf」意為「Gnt 版的 Guifications」，「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
 #: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../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:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "使用歷史記錄模組，先要啟用日誌功能"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1971,11 +2019,11 @@ msgstr "歷史記錄"
 msgid "GntHistory"
 msgstr "歷史記錄"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1988,7 +2036,7 @@ msgid "lastlog: Searches for a substring
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog：在交談的回捲緩衝區搜尋字串。"
 
 #: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
@@ -1998,97 +2046,96 @@ msgstr ""
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1208
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "è«‹å¡«å¦¥æ•´ä»½è¡¨æ ¼æ‰€æœ‰çš„æ¬„ä½ã€‚"
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "è«‹è¼¸å…¥ä½ ç›®å‰çš„å¯†ç¢¼ä»¥åŠå¸Œæœ›ä½¿ç”¨çš„æ–°å¯†ç¢¼ã€‚"
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資料"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
-# XXX 問題：
-# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libgaim/account.c - 「Unknownã€æŒ‡ä¸çŸ¥é“æ˜¯ä»€éº¼é€šè¨Šå”å®šï¼Œè­¯ã€Œä¸æ˜Žã€è¼ƒå¥½ï¼ˆå› ç‚ºä¸€å®šã€Œæ›¾ç¶“çŸ¥é“ã€ï¼Œ
-# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libgaim/protocols/* - 「Unknownã€æŒ‡ä¸æ˜Žçš„å¥½å‹ç‹€æ…‹ï¼Œå¯èƒ½æ˜¯æŒ‡ã€Œä¸æ˜Žã€ï¼ˆé€šè¨Šç³»çµ±å›žå ±çš„ç‹€æ…‹æ˜¯ã€Œä¸æ˜Žã€ï¼‰
-# XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
+# XXX 問題：
+# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../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
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../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
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2098,58 +2145,62 @@ msgstr "好友清單"
 msgid "buddy list"
 msgstr "好友清單"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "（並不相符）"
 
+#  XXX 這是暫譯 - acli 20070913
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s 出示了以下隨用即棄的證書："
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"全名：%s %s\n"
+"指紋 (SHA1)：%s"
 
+#  XXX 這是暫譯 - acli 20070913
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "æ ¸å¯¦å³æ£„è­‰æ›¸"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "證書機構"
 
+#  TODO Untranslated - acli 20070913
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL Peer 快取"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1185
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受邀請嗎？"
+msgstr "接受 %s 的證書嗎？"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "æ ¸å¯¦ SSL 證書"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
-msgstr "接受(_A)"
+msgstr "接受"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2157,77 +2208,76 @@ msgstr "拒絕"
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
-msgstr ""
+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:1288
+#: ../libpurple/certificate.c:1303
 #, 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 ""
+msgstr "「%s」出示的證書聲稱它應該屬於「%sã€ï¼Œä½ ç›®å‰å¯èƒ½çš„é€£ç·šå¯èƒ½ä¸æ˜¯ä½ å¿ƒç›®ä¸­å¸Œæœ›ä½¿ç”¨çš„æœå‹™ã€‚"
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
-msgstr ""
+msgstr "「%sã€å‡ºç¤ºçš„è­‰æ›¸æ˜¯è‡ªç°½çš„ï¼Œç„¡æ³•è‡ªå‹•é€²è¡Œæ ¸å¯¦ã€‚"
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "「%s」出示的證書鍊是無效的。"
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
-msgstr "寫入錯誤"
+msgstr "SSL 證書錯誤"
 
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
-msgstr "標題無效"
+msgstr "無效的證書鏈"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr ""
+msgstr "ç„¡æ³•æ ¸å¯¦é€™å¼µè­‰æ›¸ï¼Œå› ç‚ºä½ æ²’æœ‰æ ¹è­‰æ›¸æ©Ÿæ§‹è­‰æ›¸ (root certificate) 的資料庫。"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
+msgstr "這張證書聲稱由一所 Pidgin ä¸èªè­˜çš„æ ¹è­‰æ›¸æ©Ÿæ§‹ç°½ç™¼ã€‚"
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
-msgstr ""
+msgstr "「%s」出示的證書鍊聲稱它是由某證書機構簽發，但實際上卻沒有該證書機構的有效簽署。"
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "證書機構的簽署是無效的"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2237,21 +2287,25 @@ msgstr ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"全名：%s\n"
+"\n"
+"指紋 (SHA1)：%s\n"
+"\n"
+"生效日期：%s\n"
+"失效日期：%s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
-msgstr "伺服器資訊"
+msgstr "證書資訊"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "註冊錯誤"
+msgstr "移除註冊錯誤"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2263,10 +2317,12 @@ msgstr "+++ %s 登出"
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -2331,23 +2387,23 @@ msgstr "無法建立連結：%s"
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結：%s"
 
-# TODO 覆查譯文 - 20061028
+# TODO 覆查譯文 - 20061028
 #: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "無法取得名稱：%s"
 
-# TODO 覆查譯文 - 20061028
+# TODO 覆查譯文 - 20061028
 #: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱：%s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "å› ä¸‹åˆ—åŽŸå› ï¼ŒPurple çš„ D-BUS 伺服器未有執行"
 
-# NOTE 暫譯，或許有其他意義
+# NOTE 暫譯，或許有其他意義
 #: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "未命名"
@@ -2360,7 +2416,7 @@ msgstr "無法送出訊息給解析程åº
 msgid "Unable to send request to resolver process\n"
 msgstr "無法送出訊息給解析程序\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2369,8 +2425,8 @@ msgstr ""
 "解析 %s 途中發生了錯誤：\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 途中發生了錯誤：%d"
@@ -2385,16 +2441,15 @@ msgstr ""
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒：%s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "åŽŸå› ä¸æ˜Ž"
 
@@ -2457,7 +2512,7 @@ msgstr "接受來自於「%s」的檔案
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎？"
 
-#  XXX æš«è­¯
+#  XXX 暫譯
 #: ../libpurple/ft.c:401
 #, c-format
 msgid ""
@@ -2495,7 +2550,6 @@ msgstr "檔案 %s 傳送完畢"
 msgstr "檔案 %s 傳送完畢"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -2505,7 +2559,6 @@ msgstr "ä½ å–æ¶ˆäº† %s 的傳送"
 msgstr "ä½ å–æ¶ˆäº† %s 的傳送"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2695,7 +2748,7 @@ msgstr "純文字"
 msgid "Plain text"
 msgstr "純文字"
 
-#  NOTE: xfce 譯「flat file」為「平面檔案」
+#  NOTE: xfce 譯「flat file」為「平面檔案」
 #: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "舊式平面檔案"
@@ -2713,20 +2766,16 @@ msgid ""
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
-"</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
-"</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案！</b></font>"
@@ -2741,59 +2790,54 @@ msgstr "(%s) %s <自動回覆>：%s\n"
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "ä½ ç›®å‰ä½¿ç”¨çš„æ˜¯ %s，但這模組需要 %s。"
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "模組不符 %d (需要 %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "模組並未實作所有必要的功能"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "無法載入模組"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "ç„¡æ³•è¼‰å…¥ä½ æ‰€æä¾›çš„æ¨¡çµ„ã€‚"
 
-#: ../libpurple/plugin.c:677
+#: ../libpurple/plugin.c:663
 #, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "關聯模組 %s 卸載失敗。"
+msgid "%s requires %s, but it failed to unload."
+msgstr "模組「%s」需要模組「%s」，但後者卸載失敗。"
 
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "卸載模組途中遭遇錯誤。"
-
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "自動接受"
@@ -2827,18 +2871,19 @@ msgstr "儲存(_S)"
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#  TODO: ä¸é€šé † - 20070414
+#  TODO: 不通順 - 20070414
 #: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問一問我"
@@ -2865,7 +2910,7 @@ msgstr "自動拒絶"
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
-#  NOTE 這些都是視窗標題
+#  NOTE 這些都是視窗標題
 #: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
@@ -2891,8 +2936,10 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "備註"
 
@@ -2982,8 +3029,8 @@ msgstr "提供透過在檔案中輸入æŒ
 msgid "Allows control by entering commands in a file."
 msgstr "提供透過在檔案中輸入指令來控制本程式的功能。"
 
-#  NOTE 這是是輸入欄位左邊的標籤，「幾多分鐘」、「分鐘數」的意思
-#  FIXME 譯文有待改進
+#  NOTE 這是是輸入欄位左邊的標籤，「幾多分鐘」、「分鐘數」的意思
+#  FIXME 譯文有待改進
 #: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分鐘數"
@@ -3044,16 +3091,15 @@ msgstr "以用戶端身份測試插件ç³
 msgid "Test plugin IPC support, as a client."
 msgstr "以用戶端身份測試插件系統的 IPC 支援。"
 
-# FIXME å‹™å¿…è¦è¦†æ ¸é€™æ®µè­¯æ–‡!!!
-# NOTE 譯文更動 by Paladin
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr ""
-"以用戶端身份測試模組系統的 IPC 支援，即是找尋伺服器模組後呼叫事先掛載的指令。"
+msgstr "以用戶端身份測試模組系統的 IPC 支援，即是找尋伺服器模組後呼叫事先掛載的指令。"
 
 #. *< type
 #. *< ui_requirement
@@ -3072,15 +3118,15 @@ msgstr "以伺服器身份測試插件ç³
 msgid "Test plugin IPC support, as a server."
 msgstr "以伺服器身份測試插件系統的 IPC 支援。"
 
-# FIXME å‹™å¿…è¦è¦†æ ¸é€™æ®µè­¯æ–‡!!!
-# NOTE 譯文更動 by Paladin
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "以伺服器身份測試模組系統的 IPC 支援，即是掛載測試用的 IPC 指令。"
 
-#  XXX ä¸é€šé †
+#  XXX 不通順
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "è¨­å®šå¦‚ä½•éš±è—ã€ŒåŠ å…¥/離開聊天室」的訊息"
@@ -3093,7 +3139,7 @@ msgstr "閒置時間下限（分鐘）"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "閒置時間下限（分鐘）"
 
-#  XXX ä¸é€šé †
+#  XXX 不通順
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3104,7 +3150,7 @@ msgstr "éš±è—ã€ŒåŠ å…¥/離開聊天室ã
 msgid "Join/Part Hiding"
 msgstr "éš±è—ã€ŒåŠ å…¥/離開聊天室」訊息"
 
-#  XXX ä¸é€šé †
+#  XXX 不通順
 #. *< name
 #. *< version
 #. *  summary
@@ -3117,123 +3163,127 @@ msgid ""
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
-msgstr ""
-"é€™å€‹æ¨¡çµ„ä¿‚é‡å°å¤§åž‹èŠå¤©å®¤å…§ä¸åœå‡ºç¾ã€ŒåŠ å…¥/離開聊天室」訊息的問題而設。除非是正"
-"åœ¨èŠå¤©çš„ä½¿ç”¨è€…åŠ å…¥/é›¢é–‹èŠå¤©å®¤ï¼Œå¦å‰‡æ‰€æœ‰å…¶ä»–çš„ã€ŒåŠ å…¥/離開聊天室」訊息將一概于"
-"以隱藏。"
+msgstr "é€™å€‹æ¨¡çµ„ä¿‚é‡å°å¤§åž‹èŠå¤©å®¤å…§ä¸åœå‡ºç¾ã€ŒåŠ å…¥/é›¢é–‹èŠå¤©å®¤ã€è¨Šæ¯çš„å•é¡Œè€Œè¨­ã€‚é™¤éžæ˜¯æ­£åœ¨èŠå¤©çš„ä½¿ç”¨è€…åŠ å…¥/é›¢é–‹èŠå¤©å®¤ï¼Œå¦å‰‡æ‰€æœ‰å…¶ä»–çš„ã€ŒåŠ å…¥/離開聊天室」訊息將一概于以隱藏。"
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "自動回應送出："
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "ä½ å·²ç¶“åœæ­¢èˆ‡ä¼ºæœå™¨çš„é€£ç·šã€‚"
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "ä½ ç›®å‰æ˜¯é›¢ç·šç‹€æ…‹ã€‚åœ¨ä½ é‡æ–°ç™»å…¥å‰ï¼Œå°‡ç„¡æ³•æ”¶åˆ°ä»»ä½•è¨Šæ¯ã€‚"
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限，所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
-# #NOTE æ ¹æ“šã€Œplugins/log_reader.c#1971」的訊息來判斷，應該是指一種新式的通訊協定。
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷，應該是指一種新式的通訊協定。
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-# #NOTE æ ¹æ“šã€Œplugins/log_reader.c#1971」的訊息來判斷，應該是指一種新式的通訊協定。
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
-#  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學）
-#  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2462
+#  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學）
+#  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -3243,20 +3293,20 @@ msgstr "日誌目錄"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
-# XXX 譯文有待改進（第二段） - 20061025
+# XXX 譯文有待改進（第二段） - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3264,8 +3314,7 @@ msgstr ""
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"當瀏覽日誌時，這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger，以及 Trillian。\n"
+"當瀏覽日誌時，這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 Adium、Fire、Messenger Plus!、MSN Messenger，以及 Trillian。\n"
 "\n"
 "æ³¨æ„ï¼šé€™å€‹æ¨¡çµ„ä»è™•æ–¼é–‹ç™¼åˆæœŸï¼Œå› æ­¤å¯èƒ½ç¶“å¸¸ç•¶æŽ‰ã€‚å¦‚æžœä½¿ç”¨ï¼Œå¾Œæžœè‡ªè² ï¼"
 
@@ -3316,18 +3365,14 @@ msgid ""
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
-"的對話視窗中編輯或刪除。"
+msgstr "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」的對話視窗中編輯或刪除。"
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"「%sã€ç›®å‰ç‚ºé›¢ç·šï¼Œä½ è¦ä½¿ç”¨ã€Œå¥½å‹ç‹€æ…‹æ•æ‰ã€åŠŸèƒ½å„²å­˜æœªèƒ½é€å‡ºçš„è¨Šæ¯å—Žï¼Ÿï¼ˆå„²å­˜çš„"
-"訊息將在「%s」下次登入時自動送出）"
+msgstr "「%sã€ç›®å‰ç‚ºé›¢ç·šï¼Œä½ è¦ä½¿ç”¨ã€Œå¥½å‹ç‹€æ…‹æ•æ‰ã€åŠŸèƒ½å„²å­˜æœªèƒ½é€å‡ºçš„è¨Šæ¯å—Žï¼Ÿï¼ˆå„²å­˜çš„è¨Šæ¯å°‡åœ¨ã€Œ%s」下次登入時自動送出）"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3338,26 +3383,32 @@ msgstr "ä½ å¯ä»¥åœ¨ã€Œå¥½å‹ç‹€æ…‹æ•æ
 msgstr "ä½ å¯ä»¥åœ¨ã€Œå¥½å‹ç‹€æ…‹æ•æ‰ã€çš„å°è©±è¦–çª—ä¸­ç·¨è¼¯æˆ–åˆªé™¤ç‹€æ…‹æ•æ‰"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "是"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "否"
 
@@ -3398,9 +3449,7 @@ msgid ""
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"å°æ–¹ä¸€é–‹å§‹èˆ‡ä½ äº¤è«‡ï¼Œå°±ç«‹å³æ‰“é–‹äº¤è«‡è¦–çª—ã€‚é©ç”¨æ–¼ AIM、ICQ、XMPP、Sametime 及 "
-"Yahoo。"
+msgstr "å°æ–¹ä¸€é–‹å§‹èˆ‡ä½ äº¤è«‡ï¼Œå°±ç«‹å³æ‰“é–‹äº¤è«‡è¦–çª—ã€‚é©ç”¨æ–¼ AIM、ICQ、XMPP、Sametime 及 Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3414,7 +3463,7 @@ msgstr "離開時停用"
 msgid "Disable when away"
 msgstr "離開時停用"
 
-# FIXME 譯文有待改進 - 20061027
+# FIXME 譯文有待改進 - 20061027
 #: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
@@ -3429,7 +3478,7 @@ msgstr "浮現「未卜先知」的交è«
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -3437,8 +3486,8 @@ msgstr "信號測試"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -3461,10 +3510,10 @@ msgstr "用來測試是否大部份的æ
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 證書"
 
 #. *< type
 #. *< ui_requirement
@@ -3472,7 +3521,7 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3480,8 +3529,8 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -3491,7 +3540,7 @@ msgstr "透過 GNUTLS 提供 SSL 的支æ
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3499,8 +3548,8 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -3584,67 +3633,72 @@ msgstr "在交談視窗中顯示好友é›
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"找不到 ActiveTCL；如果打算使用 TCL 寫成的模組，請到 http://www.activestate."
-"com 下載及安裝 ActiveTCL。\n"
+msgstr "找不到 ActiveTCL；如果打算使用 TCL 寫成的模組，請到 http://www.activestate.com 下載及安裝 ActiveTCL。\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+# FIXME 沒有譯「toolkit」- 20071023 acli
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr "找不到 Apple 的 Bonjour For Windows toolkit，詳情請到網址 http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查閱 FAQ 部分。"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:126
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:153
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:369
+#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:375
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:378
+#: ../libpurple/protocols/bonjour/bonjour.c:683
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:381
+#: ../libpurple/protocols/bonjour/bonjour.c:686
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
@@ -3658,113 +3712,114 @@ msgstr "XMPP 帳號"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:485
+#: ../libpurple/protocols/bonjour/bonjour.c:487
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
-#  XXX 這原文很奇怪 - ambrose 20070414
-#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#  XXX 這原文很奇怪 - ambrose 20070414
+#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
+#: ../libpurple/protocols/bonjour/bonjour.c:628
 msgid "Purple Person"
 msgstr "聯絡人"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:680
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "電子郵件"
 
-# NOTE 這是通訊協定名稱，不是問候語
+# NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:672
+#: ../libpurple/protocols/bonjour/jabber.c:690
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Error setting socket options"
 msgstr "設定 Socket é¸é …æ™‚éŒ¯èª¤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket åˆ°é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:635
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr ""
-"å°æ–¼ä½ ç›®å‰æ‰€è¨­å®šçš„ä»£ç†ä¼ºæœå™¨åž‹æ…‹ä¾†èªªï¼Œä½ æ‰€æŒ‡å®šçš„ä¼ºæœå™¨åç¨±åŠé€šè¨ŠåŸ æ˜¯ç„¡æ•ˆçš„"
+msgstr "å°æ–¼ä½ ç›®å‰æ‰€è¨­å®šçš„ä»£ç†ä¼ºæœå™¨åž‹æ…‹ä¾†èªªï¼Œä½ æ‰€æŒ‡å®šçš„ä¼ºæœå™¨åç¨±åŠé€šè¨ŠåŸ æ˜¯ç„¡æ•ˆçš„"
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr "Token 錯誤"
+msgstr "符記錯誤"
 
 #: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr "無法取得 Token。\n"
+msgstr "無法取得符記。\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "ä½ çš„å¥½å‹æ¸…å–®æ˜¯ç©ºçš„ï¼Œæ‰€ä»¥æ²’æœ‰è³‡æ–™è¢«å¯«å…¥æª”æ¡ˆä¸­ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "無法開啟檔案"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "好友清單儲存成功！"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "無法把 %s 的好友清單寫入至檔案「%s」"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "無法讀入好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "讀取好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "好友清單讀取成功！"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
@@ -3772,306 +3827,311 @@ msgstr "新密碼並不相符。"
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "註冊成功！"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../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/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "ç”·"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "è«‹åœ¨ä¸‹æ–¹è¼¸å…¥ä½ çš„æœå°‹æ¢ä»¶"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "ä½ ç›®å‰æ‰€æä¾›çš„å¯†ç¢¼èˆ‡æŒ‡å®šçš„å¸³è™Ÿä¸ç¬¦ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "更改 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功！"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "è«‹è¼¸å…¥ä½ çš„èˆŠå¯†ç¢¼åŠä½ çš„æ–°å¯†ç¢¼ï¼š"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "更改 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友；%s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../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:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "上線"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "離開"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../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/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
-# FIXME 這不像對，要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1171
+# FIXME 這不像對，要覆查 - 20061028
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
-msgstr "ç„¡æ³•æ ¹æ“šæœå°‹æ¢ä»¶æ‰¾åˆ°ç›¸ç¬¦çš„ä½¿ç”¨è€…ã€‚"
+msgstr "ç„¡æ³•æ ¹æ“šç…§æœå°‹æ¢ä»¶æ‰¾åˆ°ç›¸ç¬¦çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "ä½ å·²å¾žä¼ºæœå™¨ä¸‹è¼‰å¥½å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "ä½ çš„å¥½å‹æ¸…å–®å·²è¢«å­˜æ”¾æ–¼ä¼ºæœå™¨ä¸Šã€‚"
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -4086,38 +4146,38 @@ msgstr "自檔案讀取好友清單..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為：%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -4151,85 +4211,83 @@ msgstr "%s 的是日訊息"
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "é »é“(_C)："
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "密碼(_P)："
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 網名不可含有空白字符"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "連線中"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+# XXX 暫譯
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+# 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
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4244,55 +4302,57 @@ msgstr "主題"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4301,8 +4361,8 @@ msgstr "使用者"
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "姓名"
@@ -4311,7 +4371,7 @@ msgstr "姓名"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -4319,14 +4379,14 @@ msgstr "模式無效"
 msgid "Bad mode"
 msgstr "模式無效"
 
-# FIXME 這是暫譯
+# FIXME 這是暫譯
 #: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "ä½ è¢«ç¦æ–¼ %s 了。"
 
-# FIXME 這是暫譯
-# NOTE 譯文更動 by Paladin
+# FIXME 這是暫譯
+# NOTE 譯文更動 by Paladin
 #: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
@@ -4345,8 +4405,8 @@ msgstr " <i>(已驗證)</i>"
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "網名"
@@ -4365,7 +4425,7 @@ msgstr "上線自"
 msgid "Online since"
 msgstr "上線自"
 
-#  XXX 其實譯得不太對，可以改進一點
+#  XXX 其實譯得不太對，可以改進一點
 #: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
@@ -4374,13 +4434,13 @@ msgstr "光宗耀祖"
 msgid "Glorious"
 msgstr "光宗耀祖"
 
-# NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
+# NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
 #: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
-# NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
+# NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
 #: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
@@ -4449,78 +4509,78 @@ msgstr "只限被邀請者"
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "ä½ è¢« %s 踢出：(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../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:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "網名無效"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "ä¼ºæœå™¨æ‹’çµ•äº†ä½ æ‰€æŒ‡å®šçš„ç¶²åï¼Œç¶²åä¸­å¤§æ¦‚å«æœ‰ç„¡æ•ˆå­—ç¬¦ã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "ä¼ºæœå™¨æ‹’çµ•äº†ä½ æ‰€æŒ‡å®šçš„å¸³è™Ÿåç¨±ï¼Œåç¨±ä¸­å¤§æ¦‚å«æœ‰ç„¡æ•ˆå­—ç¬¦ã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "ä½ é›¢é–‹äº†é »é“%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "ç„¡æ³•åŠ å…¥ %sï¼šå¿…é ˆè¨»å†Šã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "ç„¡æ³•åŠ å…¥é »é“"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#: ../libpurple/protocols/irc/msgs.c:1145
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨è©²å€‹ç¶²åæˆ–é »é“ã€‚"
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -4539,63 +4599,49 @@ msgstr "chanserv：送出一個指令到
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv：送出一個指令到 chanserv"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;網名1&gt; [網名2] ...ï¼šç§»é™¤æŸå€‹äººçš„ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰"
-"ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
+msgstr "deop &lt;網名1&gt; [網名2] ...ï¼šç§»é™¤æŸå€‹äººçš„ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
-msgstr ""
-"devoice &lt;網名1&gt; [網名2] ...ï¼šç§»é™¤æŸå€‹äººçš„ã€Œç™¼è¨€ã€æ¬Šé™ã€‚ç¦æ­¢æŸäº›äººåœ¨é »é“"
-"ä¸­ç™¼è¡¨ä¸ç•¶çš„è¨€è«–ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
+msgstr "devoice &lt;網名1&gt; [網名2] ...ï¼šç§»é™¤æŸå€‹äººçš„ã€Œç™¼è¨€ã€æ¬Šé™ã€‚ç¦æ­¢æŸäº›äººåœ¨é »é“ä¸­ç™¼è¡¨ä¸ç•¶çš„è¨€è«–ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr ""
-"invite &lt網名&gt; [聊天室]ï¼šé‚€è«‹æŸå€‹äººä¾†åŠ å…¥ä½ æ‰€æŒ‡å®šçš„é »é“ï¼Œæˆ–æ˜¯ç›®å‰ä½ æ‰€åœ¨çš„"
-"é »é“ã€‚"
+msgstr "invite &lt網名&gt; [聊天室]ï¼šé‚€è«‹æŸå€‹äººä¾†åŠ å…¥ä½ æ‰€æŒ‡å®šçš„é »é“ï¼Œæˆ–æ˜¯ç›®å‰ä½ æ‰€åœ¨çš„é »é“ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]：以指定的密碼匙"
-"ï¼ˆå¦‚æœ‰çµ¦äºˆä¸¦æœ‰éœ€è¦ï¼‰åŠ å…¥æ‰€æŒ‡å®šçš„èŠå¤©å®¤ã€‚"
+msgstr "j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]ï¼šä»¥æŒ‡å®šçš„å¯†ç¢¼åŒ™ï¼ˆå¦‚æœ‰çµ¦äºˆä¸¦æœ‰éœ€è¦ï¼‰åŠ å…¥æ‰€æŒ‡å®šçš„èŠå¤©å®¤ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]：以指定的密碼"
-"åŒ™ï¼ˆå¦‚æœ‰çµ¦äºˆä¸¦æœ‰éœ€è¦ï¼‰åŠ å…¥æ‰€æŒ‡å®šçš„èŠå¤©å®¤ã€‚"
+msgstr "join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]ï¼šä»¥æŒ‡å®šçš„å¯†ç¢¼åŒ™ï¼ˆå¦‚æœ‰çµ¦äºˆä¸¦æœ‰éœ€è¦ï¼‰åŠ å…¥æ‰€æŒ‡å®šçš„èŠå¤©å®¤ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr ""
-"kick &lt;網名&gt; [訊息]ï¼šå°‡æŸå€‹ä½¿ç”¨è€…è¸¢å‡ºé »é“ã€‚ä½ å¿…éœ€å…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™"
-"æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
+msgstr "kick &lt;網名&gt; [訊息]ï¼šå°‡æŸå€‹ä½¿ç”¨è€…è¸¢å‡ºé »é“ã€‚ä½ å¿…éœ€å…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
-msgstr ""
-"list：列出目前在網絡上的聊天室清單。<i>è«‹æ³¨æ„ï¼Œæœ‰äº›ä¼ºæœå™¨æœƒåœ¨ä½ åŸ·è¡Œäº†é€™å€‹å‹•ä½œ"
-"ä¹‹å¾Œï¼Œå¼·è¡Œä¸­æ­¢ä½ çš„é€£ç·šã€‚</i>"
+msgstr "list：列出目前在網絡上的聊天室清單。<i>è«‹æ³¨æ„ï¼Œæœ‰äº›ä¼ºæœå™¨æœƒåœ¨ä½ åŸ·è¡Œäº†é€™å€‹å‹•ä½œä¹‹å¾Œï¼Œå¼·è¡Œä¸­æ­¢ä½ çš„é€£ç·šã€‚</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4609,23 +4655,20 @@ msgid ""
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;網名|é »é“&gt;ï¼šè¨­å®šæˆ–è§£é™¤é »é“â•±ä½¿ç”¨è€…æ¨¡å¼ã€‚"
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;網名|é »é“&gt;ï¼šè¨­å®šæˆ–è§£é™¤é »é“â•±ä½¿ç”¨è€…æ¨¡å¼ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr ""
-"msg &lt;網名&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免傳送到公眾"
-"é »é“ä¸­ï¼‰ã€‚"
+msgstr "msg &lt;網名&gt; &lt;訊息&gt;ï¼šé€å‡ºä¸€å€‹ç§äººè¨Šæ¯çµ¦æŒ‡å®šçš„ä½¿ç”¨è€…ï¼ˆé¿å…å‚³é€åˆ°å…¬çœ¾é »é“ä¸­ï¼‰ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [é »é“]ï¼šåˆ—å‡ºç›®å‰åœ¨é »é“ä¸­çš„ä½¿ç”¨è€…æ¸…å–®ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新網名&gt;ï¼šæ”¹è®Šä½ çš„ç¶²åã€‚"
 
@@ -4637,17 +4680,13 @@ msgid ""
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"op &lt;網名&gt; [網名] ...ï¼šè³¦èˆ‡æŸå€‹ä½¿ç”¨è€…ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »"
-"道管理者」權限才能執行這個動作。"
+msgstr "op &lt;網名&gt; [網名] ...ï¼šè³¦èˆ‡æŸå€‹ä½¿ç”¨è€…ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€æ¬Šé™æ‰èƒ½åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr ""
-"operwall &lt;訊息&gt;ï¼šå¦‚æžœä½ ä¸çŸ¥é“é€™æ˜¯å¹¹ä»€éº¼ç”¨çš„ï¼Œä½ å¯èƒ½æ²’æœ‰è¾¦æ³•ä½¿ç”¨é€™å€‹æŒ‡"
-"令。"
+msgstr "operwall &lt;訊息&gt;ï¼šå¦‚æžœä½ ä¸çŸ¥é“é€™æ˜¯å¹¹ä»€éº¼ç”¨çš„ï¼Œä½ å¯èƒ½æ²’æœ‰è¾¦æ³•ä½¿ç”¨é€™å€‹æŒ‡ä»¤ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
@@ -4657,31 +4696,25 @@ msgid ""
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr ""
-"part [é »é“] [訊息]ï¼šé›¢é–‹ç›®å‰çš„é »é“æˆ–æŒ‡å®šçš„é »é“ã€‚æŒ‡å®šé »é“æ™‚å¯åŒæ™‚æŒ‡å®šé€å‡ºçš„è¨Š"
-"息。"
+msgstr "part [é »é“] [訊息]ï¼šé›¢é–‹ç›®å‰çš„é »é“æˆ–æŒ‡å®šçš„é »é“ã€‚æŒ‡å®šé »é“æ™‚å¯åŒæ™‚æŒ‡å®šé€å‡ºçš„è¨Šæ¯ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr ""
-"ping [網名]：查詢某一個使用者的網絡回應速度（或在沒有指定使用者時，查詢伺服器"
-"的回應速度）。"
+msgstr "ping [網名]：查詢某一個使用者的網絡回應速度（或在沒有指定使用者時，查詢伺服器的回應速度）。"
 
 #: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr ""
-"query &lt;網名&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者（避免發送到公"
-"çœ¾é »é“ï¼‰ã€‚"
+msgstr "query &lt;網名&gt; &lt;訊息&gt;ï¼šé€å‡ºä¸€å€‹ç§äººè¨Šæ¯çµ¦æŒ‡å®šçš„ä½¿ç”¨è€…ï¼ˆé¿å…ç™¼é€åˆ°å…¬çœ¾é »é“ï¼‰ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]：自伺服器離線，並送出指定的訊息。"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]：送出一個 RAW 指令到伺服器。"
@@ -4690,9 +4723,7 @@ msgid ""
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr ""
-"remove &lt;網名&gt; [訊息]ï¼šå°‡æŸå€‹ä½¿ç”¨è€…è¸¢å‡ºé »é“ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„"
-"æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
+msgstr "remove &lt;網名&gt; [訊息]ï¼šå°‡æŸå€‹ä½¿ç”¨è€…è¸¢å‡ºé »é“ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½å¤ åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4714,17 +4745,13 @@ msgid ""
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"voice &lt;網名&gt; [網名] ...ï¼šè³¦èˆ‡ä½¿ç”¨è€…çš„ã€Œç™¼è¨€ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†"
-"者」的權限才能執行這個動作。"
+msgstr "voice &lt;網名&gt; [網名] ...ï¼šè³¦èˆ‡ä½¿ç”¨è€…çš„ã€Œç™¼è¨€ã€æ¬Šé™ã€‚ä½ å¿…é ˆå…·æœ‰ã€Œé »é“ç®¡ç†è€…ã€çš„æ¬Šé™æ‰èƒ½åŸ·è¡Œé€™å€‹å‹•ä½œã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr ""
-"wallops &lt;message&gt;ï¼šå¦‚æžœä½ ä¸çŸ¥é“é€™æ˜¯å¹¹ä»€éº¼ç”¨çš„ï¼Œä½ å¯èƒ½å°±æ²’æœ‰è¾¦æ³•ä½¿ç”¨å®ƒ"
-"了。"
+msgstr "wallops &lt;message&gt;ï¼šå¦‚æžœä½ ä¸çŸ¥é“é€™æ˜¯å¹¹ä»€éº¼ç”¨çš„ï¼Œä½ å¯èƒ½å°±æ²’æœ‰è¾¦æ³•ä½¿ç”¨å®ƒäº†ã€‚"
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4734,108 +4761,103 @@ msgstr "whowas &lt;網名&gt;：取得å·
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;網名&gt;：取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "指令被停用"
+msgstr "臨時指令失敗"
 
-# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "æ²’æœ‰é æœŸçš„ç„¡æ•ˆåƒæ•¸"
+msgstr "執行"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè­‰"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr "%s éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè­‰ã€‚å…è¨±ä¸¦ç¹¼çºŒé€²è¡Œèªè­‰ï¼Ÿ"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "ä¼ºæœå™¨éœ€è¦ç¶“ç”±æœªç¶“åŠ å¯†çš„ä¸²æµé€²è¡Œæ˜Žæ–‡èªè­‰ã€‚å…è¨±ä¸¦ç¹¼çºŒé€²è¡Œèªè­‰ï¼Ÿ"
 
-# XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+# XXX 好像有些怪，譯文有待改進
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:892
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4854,7 +4876,7 @@ msgstr "名"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -4885,7 +4907,7 @@ msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
@@ -4913,16 +4935,17 @@ msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "描述"
 
@@ -4937,7 +4960,7 @@ msgstr "以下所有的欄位都是選æ“
 "comfortable."
 msgstr "ä»¥ä¸‹æ‰€æœ‰çš„æ¬„ä½éƒ½æ˜¯é¸æ“‡æ€§çš„ã€‚ä½ åªè¦è¼¸å…¥ä½ æƒ³è¼¸å…¥ä½ æƒ³å¡«å…¥çš„è¨Šæ¯å³å¯ã€‚"
 
-# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：Pidgin）
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
@@ -4948,190 +4971,185 @@ msgstr "作業系統"
 msgid "Operating System"
 msgstr "作業系統"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "最近活動"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "設定使用者個人資料"
+msgstr "服務探尋資訊"
 
+#  FIXME acli 2070914
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "æœå‹™æŽ¢å°‹é …ç›®"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "地址(續)"
+msgstr "延伸段落定址"
 
+# NOTE 這是功能名稱
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "給聊天室改別名"
+msgstr "多用戶聊天"
 
+# NOTE 這是功能名稱（直譯）
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "這個使用者沒有他的相關資訊。"
+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
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "帶內位元組串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "指令"
+msgstr "臨時指令"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "PubSub 服務"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "SOCKS5 位元組串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
+msgstr "帶外數據"
 
+#  NOTE Untranslated
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "註冊錯誤"
+msgstr "帶內註冊"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "所在位置"
+msgstr "使用者所在位置"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "使用者搜尋"
+msgstr "使用者化身"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "好友狀態通知"
+msgstr "聊天狀態通知"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+# 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
-#, fuzzy
 msgid "Software Version"
-msgstr "不支援指定的 XMPP 版本"
+msgstr "軟件版本"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "方向"
+msgstr "開始串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "使用者模式"
+msgstr "使用者情緒"
 
 # XXX may be wrong
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "使用者數目上限"
+msgstr "使用者活動狀態"
 
+#  NOTE 直譯：個體能力
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "兼容性"
+msgstr "個體能力"
 
+#  FIXME 這聽來不對 - acli 20070913
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "åŠ å¯†å·¥ä½œéšŽæ®µå”å•†"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "使用者"
+msgstr "使用者樂曲"
 
+#  NOTE「Roster」指「名冊」，但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "要交換密碼匙之即時訊息"
+msgstr "å¥½å‹æ¸…å–®é …ç›®äº¤æ›"
 
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」（例如電話號碼）
+#  NOTE 直譯：可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好？但要先看上下文 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "電子郵件"
+msgstr "可抵達性位址"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "個人資料"
+msgstr "使用者資料"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "åŠ å…¥"
+msgstr "Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Jingle 音訊"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "使用者名稱"
+msgstr "使用者網名"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
@@ -5140,56 +5158,51 @@ msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "動態視像"
+msgstr "Jingle 視像"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "收到訊息"
+msgstr "收到的訊息"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
+msgstr "發佈公開密碼匙"
 
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "ä½¿ç”¨è€…è‡ªå®šé¸é …"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "使用者模式"
+msgstr "使用者瀏覽"
 
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "使用者名稱"
+msgstr ""
 
-# XXX may be wrong
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "使用者數目上限"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5197,19 +5210,19 @@ msgstr "Ping"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Trillian åŠ å¯†"
+msgstr "æ®µè½åŠ å¯†"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr ""
 
+#  XXX 暫譯- acli 20070913
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "延遲送出"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
@@ -5224,46 +5237,47 @@ msgid "STUN Service Discovery for Jingle
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "Jingle 用的 STUN 服務偵測"
 
+# FIXME 這聽來不對
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "ç°¡åŒ–åŠ å¯†å·¥ä½œéšŽæ®µå”å•†"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "中繼段檢查"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "兼容性"
 
 # TODO Untranslated
-# NOTE 譯文刪除 by Ambrose
-# NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
-# NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
-# NOTE 見 http://www.jabber.org/user/userguide.html
+# NOTE 譯文刪除 by Ambrose
+# NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
+# NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
+# NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "優先次序"
 
-# NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
+# NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
+# NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
 #: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
@@ -5271,9 +5285,9 @@ msgstr "英文別名"
 msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5288,151 +5302,146 @@ msgstr "照片"
 msgid "Photo"
 msgstr "照片"
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0054.html
+# NOTE 見 http://www.jabber.org/jeps/jep-0054.html
 #: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
-# NOTE Jabber協定的「Subscribeã€ä¸€è©žä¹ƒã€ŒåŠ å…¥å¥½å‹åå–®ã€çš„æ„æ€
-# NOTE 見 http://www.jabber.org/user/userguide.html
+# NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
+# NOTE 見 http://www.jabber.org/user/userguide.html
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "已登入"
+msgstr "登入"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "記錄所有聊天內容"
+msgstr "登出"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
-msgstr ""
-"請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
-"符 (%) 搜尋"
+msgstr "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字符 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "搜尋"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:2427
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "聊天室(_R)："
@@ -5464,13 +5473,13 @@ msgstr "伺服器名稱無效"
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
-# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
+# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
 #: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的網名"
 
-# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
+# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
 #: ../libpurple/protocols/jabber/chat.c:236
 #: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
@@ -5489,7 +5498,7 @@ msgstr "聊天室設定錯誤"
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
-# XXX 暫譯，譯文有問題，要改善
+# XXX 暫譯，譯文有問題，要改善
 #: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
@@ -5499,16 +5508,16 @@ msgstr "註冊錯誤"
 msgid "Registration error"
 msgstr "註冊錯誤"
 
-# XXX æš«è­¯
-# NOTE 據 faceprint (模組作者) 稱，MUC 是一種新的聊天室協定，
-# NOTE 較舊式的「Group Chat」有更多功能
+# XXX 暫譯
+# NOTE 據 faceprint (模組作者) 稱，MUC 是一種新的聊天室協定，
+# NOTE 較舊式的「Group Chat」有更多功能
 #: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改網名"
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
@@ -5517,7 +5526,7 @@ msgstr "無效的伺服器名"
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
 #: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
@@ -5531,30 +5540,25 @@ msgstr "尋找聊天室"
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-# XXX 譯文有待改進
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "對工作階段進行初始化時發生了錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "ä½ æŒ‡å®šå¿…é ˆåŠ å¯†ï¼Œä½†é€™ä¼ºæœå™¨æ²’æœ‰åŠ å¯†åŠŸèƒ½ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5563,741 +5567,718 @@ msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP å¸³è™Ÿç„¡æ•ˆï¼ŒåŸŸåæ˜¯å¿…é ˆè¨­å®šçš„ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:689
+#, c-format
 msgid "Registration to %s successful"
-msgstr "成功註冊 %s@%s"
+msgstr "成功註冊 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:719
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "成功註冊 %s@%s"
+msgstr "成功移除 %s 的註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
-msgstr "註冊成功"
+msgstr "移除註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
-msgstr "註冊失敗"
+msgstr "移除註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
-msgstr "註冊"
+msgstr "移除註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "ç‚ºä½ çš„æ–°å¸³æˆ¶è¨»å†Šï¼Œè«‹å¡«å¯«ä¸‹åˆ—è³‡æ–™ï¼š"
+msgstr "è«‹å¡«å¯«ä»¥ä¸‹è³‡æ–™ä»¥æ›´æ–°ä½ çš„è¨»å†Šè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "ç‚ºä½ çš„æ–°å¸³æˆ¶è¨»å†Šï¼Œè«‹å¡«å¯«ä¸‹åˆ—è³‡æ–™ï¼š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1039
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "更改 %s 的個人資料"
+msgstr "更改 %s 上的註冊資訊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#, c-format
 msgid "Register New Account at %s"
-msgstr "註冊新的 XMPP 帳戶"
+msgstr "註冊在 %s 的新帳號"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
-msgstr "註冊錯誤"
+msgstr "更改註冊資訊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
-msgstr "更改帳號資訊錯誤"
+msgstr "移除帳號註冊錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
-msgstr "成功建立了一個羣 (Qun)"
+msgstr "移除帳號註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
-msgstr "串流初始中"
+msgstr "SSL/TLS 初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
-# NOTE LSchiere2 的補充如下：
+# NOTE 這些奇怪 Jabber 術語（至「Subscription」條）的解釋由 faceprint 提供
+# NOTE LSchiere2 的補充如下：
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "å·²èªè­‰å°æ–¹ï¼ˆä½†ä»ç­‰å¾…å°æ–¹èªè­‰ä½ ï¼‰"
 
-# FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è­¯
-#  NOTE gntnotify 字義為「發信人」
-#  NOTE Jabber 術語字義見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1446
+# FIXME 原文一詞兩義，根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "已認證對方"
 
-#  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "ç„¡ï¼ˆä½†æ­£ç­‰å¾…å°æ–¹èªè­‰ä½ ï¼‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "ç„¡"
 
-#  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#  NOTE Jabber 術語，見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
+# NOTE from #pidgin, on 20070920:
+# NOTE (20時05分52秒) wing: what does "Current Media" in the new msn code mean?
+# NOTE (20時07分19秒) rekkanoryo: wing: it's more or less "Now Playing"
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "正在播放"
+
+# XXX 要覆查 - acli 20070914
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Mood Text"
-msgstr "血型"
+msgstr "描述情緒"
 
-#  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "允許「嗶」功能"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Artist"
-msgstr "平面設計"
+msgstr "樂手名稱"
 
-# FIXME åŽŸæ–‡ä¸€è©žå…©ç¾©ï¼Œæ ¹æœ¬ç„¡æ³•ç¿»è­¯
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune Title"
-msgstr "職銜"
+msgstr "樂曲名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
-msgstr ""
+msgstr "專輯名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
-msgstr ""
+msgstr "樂曲種類"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
+# XXX 譯文有待改進
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
-msgstr "好友說明"
+msgstr "樂曲註釋"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+# NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
+# FIXME 
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
-msgstr ""
+msgstr "樂曲 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
-msgstr ""
+msgstr "樂曲長度"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
-msgstr ""
+msgstr "作曲年份"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
-msgstr ""
+msgstr "樂曲網址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "允許"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "æˆåŠŸä¿®æ”¹äº†ä½ çš„å¯†ç¢¼ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "è«‹è¼¸å…¥ä½ çš„æ–°å¯†ç¢¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1845
+# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
-#  NOTE Jabber 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
-#  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#  NOTE Jabber 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
+#  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
-#  NOTE Jabber 錯誤 <forbidden/>ï¼Œæ„æ€æ­£å¸¸ï¼ˆè¡¨ç¤ºæ¬Šé™ä¸å¤ ï¼‰
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "æ¬Šé™ä¸å¤ "
 
-#  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "é …ç›®æœªæ‰¾åˆ°"
 
-# FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1859
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "畸型的 XMPP 帳號"
 
-#  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
-#  NOTE 條件（例如訊息中含有禁字），以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#  NOTE Jabber 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
+#  NOTE 條件（例如訊息中含有禁字），以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "å¿…é ˆä»˜æ¬¾"
 
-#  NOTE Jabber 錯誤 <recipient-unavailable/>
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTEã€Œæš«æ™‚ç„¡æ³•è¯çµ¡ã€æ‡‰è©²æ¯”ã€Œä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#  NOTE Jabber 錯誤 <recipient-unavailable/>
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE「暫時無法聯絡」應該比「不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "å¿…é ˆè¨»å†Š"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "é ç«¯ä¼ºæœå™¨æœªæ‰¾åˆ°"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "é ç«¯ä¼ºæœå™¨é€¾æ™‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
-#  NOTE Jabber 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#  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
 msgid "Service Unavailable"
 msgstr "ä¸æä¾›è©²é …æœå‹™"
 
-#  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
-#  NOTE å¿…é ˆäº‹å…ˆå–å¾—ã€ŒSubscription」（認證）
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#  NOTE Jabber 錯誤 <subscription-required/>，表示使用「服務」前
+#  NOTE 必須事先取得「Subscription」（認證）
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "å¿…é ˆèªè­‰"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "æœªé æœŸçš„è¦æ±‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
-# XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1900
+# XXX 要覆查譯文
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "ç„¡æ•ˆçš„æ ¼å¼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
-# FIXME å¾ˆä¸é€šé †ï¼Œè­¯æ–‡æœ‰å¾…æ”¹é€²
-# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串，
-# NOTE 表示在多處地方同時登入了的情形下，目前的實在位置
-# NOTE 見 http://www.jabber.org/user/userguide.html
-# NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1925
+# FIXME 很不通順，譯文有待改進
+# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串，
+# NOTE 表示在多處地方同時登入了的情形下，目前的實在位置
+# 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
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1929
+# NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "伺服器已不再支援所指定的伺服器名稱"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1931
+# NOTE Jabber 協定中 Stream Error 的一種，即 <host-unknown/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "帳號無效"
 
-# FIXME å¿…é ˆè¦†æŸ¥è­¯æ–‡
-#: ../libpurple/protocols/jabber/jabber.c:1939
+# FIXME 必須覆查譯文
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
-# XXX 這是暫譯，譯文有待改進
-# NOTE Jabber 協定中的「nonmatching-hosts」
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1943
+# XXX 這是暫譯，譯文有待改進
+# NOTE Jabber 協定中的「nonmatching-hosts」
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
-# XXX 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
-# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
-# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1947
+# 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
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
-# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1949
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "ç„¡æ³•é€£ç·šè‡³èªè­‰æ‰€éœ€çš„é ç«¯è³‡æº"
 
-# NOTE Jabber 協定 Stream Error 的一種，即 <resource-constraint/>
-# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1951
+# 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
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
-# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
-# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1953
+# 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
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML å…ƒç´ "
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1955
+# NOTE Jabber 協定中 Stream Error 的一種，即 <see-other-host/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1957
+# NOTE Jabber 協定中 Stream Error 的一種，即 <system-shutdown/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1959
+# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1961
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援指定的字符編碼"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1963
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援指定的段落類別 (Stanza Type)"
 
-# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1965
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "不支援指定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML æ–‡ä»¶æ ¼å¼æœ‰å•é¡Œ"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
-#  XXX æš«è­¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#  XXX 暫譯 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
-#  XXX æš«è­¯ - ambrose 20070415
-#  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#  XXX 暫譯 - ambrose 20070415
+#  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
-#  XXX æš«è­¯ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#  XXX 暫譯 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2202
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "無法禁止使用者 %s"
+msgstr "無法 Ping 使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºæ²’æœ‰æœ‰é—œå°æ–¹çš„ä»»ä½•è³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
+msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºå°æ–¹ç›®å‰å¯èƒ½é›¢ç·šã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2257
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ä¸æ”¯æ´æª”æ¡ˆå‚³è¼¸"
+msgstr "無法「嗶」使用者 %s ï¼Œå› ç‚ºå°æ–¹çš„ç”¨æˆ¶ç«¯ä¸æ”¯æ´é€™å€‹åŠŸèƒ½ã€‚"
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+msgid "Buzz"
+msgstr "嗶！"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%sã€Œå—¶ã€äº†ä½ ä¸€è²"
+
+# XXX 這是暫譯 - acli 20070913
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "registerï¼šåŠ å…¥ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
-#  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#  XXX 暫譯「（會員）等級」 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+msgstr "affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者在這聊天室內的等級"
 
-#  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#  NOTE 譯文改動 by ambrose
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
-msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+msgstr "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]ï¼šåŠ å…¥ä½æ–¼é€™å€‹ä¼ºæœå™¨çš„ä¸€å€‹èŠå¤©å®¤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
+msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
+msgstr "ping &lt;jid&gt;：Ping 一個使用者/組件/伺服器。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他（她）注意"
 
@@ -6317,36 +6298,36 @@ msgstr "XMPP 協定模組"
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "域名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "需要 SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "å…è¨±ä½¿ç”¨æ˜Žæ–‡ï¼Œåœ¨æœªç¶“åŠ å¯†çš„ä¸²æµä¸Šé€²è¡Œèªè­‰"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "é€£ç·šåŸ "
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6355,74 +6336,68 @@ msgstr "%s 已經離開這個交談。"
 msgid "%s has left the conversation."
 msgstr "%s 已經離開這個交談。"
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為：%s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題：%s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s：%s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s å·²å°‡ä½  [%s] åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "ä½ æ­£è¦å»ºç«‹ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œä½ è¦è¨­å®šå®ƒï¼Œé‚„æ˜¯ä½¿ç”¨é è¨­å€¼ï¼Ÿ"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "ä½¿ç”¨é è¨­å€¼(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "åŠ å…¥èŠå¤©å®¤ %s 時發生錯誤"
@@ -6439,785 +6414,855 @@ msgstr "傳送檔案失敗"
 msgstr "傳送檔案失敗"
 
 #: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "無法送出訊息給 %s。"
+msgstr "無法送出訊息給 %sï¼Œå› ç‚ºé€™å€‹ JID 是無效的"
 
 #: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ä¸æ”¯æ´æª”æ¡ˆå‚³è¼¸"
+msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ç›®å‰æ²’æœ‰é€£ç·š"
 
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
+#  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºå°æ–¹ä¸æ”¯æ´æª”æ¡ˆå‚³è¼¸"
+msgstr "無法傳送檔案至 %sï¼Œå› ç‚ºæœªç²å°æ–¹èªè­‰"
 
+#  FIXME 這不通順 - acli 20070614
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
+msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
 #: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
 msgid "Select a Resource"
-msgstr "選擇檔案"
+msgstr "選擇一個 Resource"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "使用者模式"
+msgstr "編輯使用者情緒"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "è«‹å¾žåˆ—è¡¨é¸æ“‡ä½ ç›®å‰çš„æƒ…ç·’ã€‚"
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "設定(_S)"
+msgstr "設定"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "送出即時訊息..."
+msgstr "設定情緒..."
 
 #  XXX may be wrong
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "設定使用者數目上限"
+msgstr "設定使用者網名"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "請輸入 %s 的新密碼"
+msgstr "è«‹ç‚ºä½ è‡ªå·±è¨­å®šæ–°çš„ç¶²åã€‚"
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "é€™æ˜¯ä½ å¥½å‹æ¸…å–®ä¸Šçš„å…¨éƒ¨å¥½å‹éƒ½æœƒçœ‹å¾—è¦‹çš„ï¼Œè«‹ä½œå‡ºé©ç•¶çš„é¸æ“‡"
 
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "網名"
+msgstr "設定網名..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "執行動作"
+msgstr "動作"
 
+#  XXX 要覆查
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "選擇檔案"
+msgstr "選擇一個動作"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "無法讀取 MSN 通訊錄"
+
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "為 %s (%s) 的好友清單進行同步化途中出現問題"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/msn/dialog.c:116
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
-msgstr ""
-"%s 在本地端的好友清單的「%sã€ç¾£çµ„è£ï¼Œå»ä¸åœ¨ä¼ºæœå™¨ä¸Šï¼›ä½ è¦æ–°å¢žé€™å€‹å¥½å‹è‡³ä¼ºæœå™¨"
-"的好友清單嗎？"
+msgstr "%s 在本地端的好友清單的「%sã€ç¾£çµ„è£ï¼Œå»ä¸åœ¨ä¼ºæœå™¨ä¸Šï¼›ä½ è¦æ–°å¢žé€™å€‹å¥½å‹è‡³ä¼ºæœå™¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/msn/dialog.c:124
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr ""
-"%s åœ¨æœ¬åœ°ç«¯çš„å¥½å‹æ¸…å–®ï¼Œéƒ¤ä¸åœ¨ä¼ºæœå™¨ä¸Šï¼›ä½ è¦æ–°å¢žé€™å€‹å¥½å‹è‡³ä¼ºæœå™¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
+msgstr "%s åœ¨æœ¬åœ°ç«¯çš„å¥½å‹æ¸…å–®ï¼Œéƒ¤ä¸åœ¨ä¼ºæœå™¨ä¸Šï¼›ä½ è¦æ–°å¢žé€™å€‹å¥½å‹è‡³ä¼ºæœå™¨çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
-# NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
+# NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤（可能是用戶端的 Bug）"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
-msgstr "無效的電子郵件位址"
+msgstr "電子郵件位址無效"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "使用者不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "æ²’çµ¦äºˆå®Œæ•´é ˜åŸŸåç¨± (FQDN)"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "已經登入"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "網名無效"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "好友清單已滿"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "已經在清單裏"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "不在清單中"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "太多羣組"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
-msgstr "無效的羣組"
+msgstr "羣組無效"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "使用者不在羣組內"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "羣組名稱過長"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號羣組"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "å˜—è©¦å°‡ä¸€å€‹ä½¿ç”¨è€…åŠ å…¥ä¸å­˜åœ¨çš„ç¾£çµ„"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
-#  XXX æš«è­¯
+#  XXX 暫譯
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "指令被停用"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "工作階段超載"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
-# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
+# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "æ²’æœ‰é æœŸçš„ç„¡æ•ˆåƒæ•¸"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "網名的更改過於急速"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "認證失敗"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
-#  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
-#  NOTE MSN 錯誤代號 928
-#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#  FIXME「ticket」暫無譯文，也許可譯「通行證」或「許可證」？
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "呼叫"
 
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s å·²å°‡ä½  [%s] åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
+msgstr "%s å‘¼å«ä½ ï¼"
 
-#: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "呼叫 %s 中..."
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "ä½ çš„æ–° MSN 網名太長。"
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "è¨­å®šä½ çš„ç¶²åã€‚"
 
-# NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
-# NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
-# XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:283
+# NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
+# NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
+# XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN æŸ¥é–±ä½ çš„å€‹äººè³‡æ–™æ™‚é¡¯ç¤ºé€™å€‹ç¶²åã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "è¨­å®šä½ çš„å®¶ç”¨é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "è¨­å®šä½ çš„è¾¦å…¬å®¤é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "è¨­å®šä½ çš„æµå‹•é›»è©±è™Ÿç¢¼ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"ä½ æ˜¯å¦å…è¨±åœ¨ä½ å¥½å‹æ¸…å–®ä¸­çš„å¥½å‹å‚³é€ Mobile Page åˆ°ä½ çš„æµå‹•é›»è©±ï¼Œæˆ–æ˜¯å…¶ä»–çš„æµå‹•"
-"通訊器材上呢？"
+msgstr "ä½ æ˜¯å¦å…è¨±åœ¨ä½ å¥½å‹æ¸…å–®ä¸­çš„å¥½å‹å‚³é€ Mobile Page åˆ°ä½ çš„æµå‹•é›»è©±ï¼Œæˆ–æ˜¯å…¶ä»–çš„æµå‹•é€šè¨Šå™¨æä¸Šå‘¢ï¼Ÿ"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "樂手名稱"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "專輯名稱"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "設定網名..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "設定家用電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "設定流動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉流動通訊器材..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "傳送至流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/msn/msn.c:726
+# XXX 暫譯
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../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/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "音樂"
 
-# NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+# 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
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "家用電話"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "家用電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "住址"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "個人流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "家用傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "商務流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "商務傳呼機"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
-msgstr ""
-"MSN å›žå ±èªªæ‰¾ä¸åˆ°é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚é€™è¡¨ç¤ºé€™å€‹ä½¿ç”¨è€…å¯èƒ½ä¸å­˜åœ¨ï¼›äº¦æœ‰å¯èƒ½ä½¿"
-"用者存在，但沒有建立公開的個人資料。"
+msgstr "MSN å›žå ±èªªæ‰¾ä¸åˆ°é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚é€™è¡¨ç¤ºé€™å€‹ä½¿ç”¨è€…å¯èƒ½ä¸å­˜åœ¨ï¼›äº¦æœ‰å¯èƒ½ä½¿ç”¨è€…å­˜åœ¨ï¼Œä½†æ²’æœ‰å»ºç«‹å…¬é–‹çš„å€‹äººè³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr ""
-"åœ¨é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ç¶²é æ‰¾ä¸åˆ°ä»»ä½•å¯ç”¨çš„è³‡æ–™ã€‚é€™å€‹ä½¿ç”¨è€…æ¥µæœ‰å¯èƒ½ä¸¦ä¸å­˜åœ¨ã€‚"
+msgstr "åœ¨é€™å€‹ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ç¶²é æ‰¾ä¸åˆ°ä»»ä½•å¯ç”¨çš„è³‡æ–™ã€‚é€™å€‹ä½¿ç”¨è€…æ¥µæœ‰å¯èƒ½ä¸¦ä¸å­˜åœ¨ã€‚"
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -7232,110 +7277,138 @@ msgstr "個人資料網址"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN 協定模組"
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+# XXX 譯文有待改進 - acli 20070918
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
-msgstr "IPC 測試伺服器"
+msgstr "HTTP 方式專用伺服器"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "無法連線"
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID 認證：無法連線"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr "Windows Live ID 認證：在伺服器傳來的回應無法找到認證符記"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID 認證失敗"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的羣組。"
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../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
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
-# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
-#: ../libpurple/protocols/msn/notification.c:187
+# NOTE: 第二個 %s 為使用者名稱，第三個 %s 為通訊協定名稱
+# NOTE: 第一個 %s 似乎係錯誤訊息摘要（整個字串為視窗標題）
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s)：%1$s"
 
-#  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s åœ¨å‘¼å«ä½ ï¼"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "不明錯誤（代碼 %d）"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "無法新增使用者"
+
+#  TODO 請覆查，譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
+#, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 新增使用者失敗"
 
-#  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:502
+#  TODO 請覆查，譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 拒絕使用者失敗"
 
-#  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:506
+#  TODO 請覆查，譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 允許使用者失敗"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "å› ç‚ºå¥½å‹æ¸…å–®å·²æ»¿ï¼Œä»¥è‡´ç„¡æ³•æ–°å¢ž %s"
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:528
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "無法更改羣組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "無法移除羣組"
 
-# NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1325
+# NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7352,27 +7425,49 @@ msgstr[0] ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN 伺服器將要在 %d åˆ†é˜å…§é—œé–‰ä»¥é€²è¡Œç¶­è­·ï¼Œå±†æ™‚ä½ å°‡æœƒç”±ä¼ºæœå™¨ä¸Šè‡ªå‹•ç™»å‡ºã€‚è«‹å„˜"
-"å¿«çµæŸä½ ç›®å‰çš„äº¤è«‡ã€‚\n"
+"MSN 伺服器將要在 %d åˆ†é˜å…§é—œé–‰ä»¥é€²è¡Œç¶­è­·ï¼Œå±†æ™‚ä½ å°‡æœƒç”±ä¼ºæœå™¨ä¸Šè‡ªå‹•ç™»å‡ºã€‚è«‹å„˜å¿«çµæŸä½ ç›®å‰çš„äº¤è«‡ã€‚\n"
 "\n"
 "ç•¶ç¶­è­·å·¥ä½œçµæŸï¼Œä½ å°‡å¯ä»¥å†åº¦ç™»å…¥ã€‚"
 msgstr[1] ""
-"MSN 伺服器將要在 %d åˆ†é˜å…§é—œé–‰ä»¥é€²è¡Œç¶­è­·ï¼Œå±†æ™‚ä½ å°‡æœƒç”±ä¼ºæœå™¨ä¸Šè‡ªå‹•ç™»å‡ºã€‚è«‹å„˜"
-"å¿«çµæŸä½ ç›®å‰çš„äº¤è«‡ã€‚\n"
+"MSN 伺服器將要在 %d åˆ†é˜å…§é—œé–‰ä»¥é€²è¡Œç¶­è­·ï¼Œå±†æ™‚ä½ å°‡æœƒç”±ä¼ºæœå™¨ä¸Šè‡ªå‹•ç™»å‡ºã€‚è«‹å„˜å¿«çµæŸä½ ç›®å‰çš„äº¤è«‡ã€‚\n"
 "\n"
 "ç•¶ç¶­è­·å·¥ä½œçµæŸï¼Œä½ å°‡å¯ä»¥å†åº¦ç™»å…¥ã€‚"
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../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
+msgid "Unable to connect"
+msgstr "無法連線"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "寫入錯誤"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "讀取錯誤"
 
-#  NOTE 首個 %s 為「Notification」或「Switchboard」其一，次為伺服器名稱，末者為錯誤訊息
+#  NOTE 首個 %s 為「Notification」或「Switchboard」其一，次為伺服器名稱，末者為錯誤訊息
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7381,369 +7476,400 @@ msgstr ""
 "%s 伺服器傳來一個連線錯誤：\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "ä½ ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
 
 #  XXX
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器，請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證：%s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "æš«æ™‚ç„¡æ³•å–å¾—ä½ çš„å¥½å‹æ¸…å–®ï¼Œè«‹éŽä¸€æœƒå¾Œé‡è©¦ã€‚"
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+# 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
 msgid "Handshaking"
-msgstr "交談中"
+msgstr "交握中"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "電話中"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時，可能沒有送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息："
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "å› ç‚ºä½¿ç”¨è€…ç›®å‰é›¢ç·šï¼Œæ‰€ä»¥ç„¡æ³•é€å‡ºè¨Šæ¯ï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "å› ç‚ºé€£ç·šç™¼ç”ŸéŒ¯èª¤ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "å› ç‚ºæˆ‘å€‘å‚³é€è¨Šæ¯çš„é€Ÿåº¦å¤ªå¿«ï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
+msgstr "å› ç‚ºç„¡æ³•èˆ‡ä¼ºæœå™¨å»ºç«‹å·¥ä½œéšŽæ®µï¼Œæ‰€ä»¥è¨Šæ¯ç„¡æ³•é€å‡ºï¼ˆé€™å¤§æ¦‚æ˜¯ä¼ºæœå™¨å‡ºç¾äº†å•é¡Œï¼Œè«‹å¹¾åˆ†é˜å¾Œé‡è©¦ï¼‰ï¼š"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "å› ç‚º Switchboard 發生錯誤，所以訊息無法送出"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "å› ç‚ºç™¼ç”Ÿä¸æ˜Žçš„éŒ¯èª¤ï¼Œè¨Šæ¯å¯èƒ½æ²’æœ‰é€å‡ºï¼š"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s å°‡ä½ åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s å°‡ä½ å¾žä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "ä½ æ‰€è¼¸å…¥çš„å¸³è™Ÿç„¡æ•ˆã€‚"
 
-# XXX æš«è­¯ - 20061025
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "ä½ åœ¨ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®è£"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "MSN 協定模組"
+
+# XXX 暫譯 - 20061025/20070912
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "åŠ å¯†æ–¹æ³•"
+msgstr "æ¬ ç¼ºéœ€è¦çš„åŠ å¯†æ–¹æ³•"
 
+# XXX 暫譯 - 20061025/20070912
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "找不到 RC4 åŠ å¯†æ–¹æ³•"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr ""
+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 ""
+msgstr "MySpace 恕不支援長於 %d å€‹å­—ç¬¦çš„å¯†ç¢¼ï¼Œè€Œä½ çš„å¯†ç¢¼å·²æ˜¯ %d 個字符長。"
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
-msgstr ""
+msgstr "MySpaceIM 錯誤"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
-msgstr "讀取錯誤"
+msgstr "讀取驗證挑戰中"
 
-# XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+# XXX 好像有些怪，譯文有待改進
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
-msgstr "伺服器送來了無效的驗證挑戰"
+msgstr "伺服器送來的驗證挑戰有意料之外的長度"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
-msgstr "日誌"
+msgstr "登入中"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgstr "與伺服器失去連線（%d 秒內收不到任何資料）"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
-msgstr "送出訊息"
+msgstr "有新郵件"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
-msgstr ""
+msgstr "網誌有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
-msgstr ""
+msgstr "å€‹äººè³‡æ–™ç¶²é æœ‰æ–°ç•™è¨€"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#  FIXME 譯文很不通順 - acli 20070913
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
-msgstr ""
+msgstr "有新的交友要求！"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
-msgstr ""
+msgstr "相片集有新留言"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
 
-# TODO 要覆查 - 20061027
+# 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:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "已連結"
 
-# NOTE 暫譯，或許有其他意義
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 msgid "No username set"
-msgstr "未命名"
+msgstr "未有設定使用者名稱"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
-msgstr ""
+msgstr "請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選擇一個使用者名稱後，再嘗試重新登入。"
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:1794
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "回應處理錯誤代碼 %d"
+msgstr "通訊協定錯誤，代碼 %d：%s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
-msgstr "ç„¡æ³•åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
+msgstr "無法新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
-msgstr "自檔案讀取好友清單..."
+msgstr "「addbuddy」指令失敗。"
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
-msgstr "Switchboard 失敗"
+msgstr "「persist」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "無此使用者：%s"
 
-# 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/myspace/myspace.c:2116
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
-msgstr "使用者建立之聊天室"
+msgstr "搜尋使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
-msgstr "ç„¡æ³•åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
+msgstr "無法移除使用者"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "「delbuddy」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
-msgstr "Switchboard 失敗"
+msgstr "「blocklist」指令失敗"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+#  NOTE「condition」可能為「條件」或「狀況」
+#  NOTE 原始碼內這字串是指「cond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITE」
+#  NOTE 所以應是「狀況」而非「條件」
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
-msgstr "完成連線"
+msgstr "輸入狀況無效"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
-msgstr "佇列滿了"
+msgstr "讀取用的暫存區滿了"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "無法解析訊息"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:2499
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器"
+msgstr "無法連到伺服器：%s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+#  NOTE 這是群組名稱
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
-msgstr "即時訊息視窗(_I)"
+msgstr "即時訊息的好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
-msgstr "伺服器送來了無效的回應。"
+msgstr "å¾žä¼ºæœå™¨åŠ å…¥è¯çµ¡äºº"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "從 MySpace.com 新增好友"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
-msgstr "模組載入失敗"
+msgstr "匯入好友失敗"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
-msgstr "修改密碼..."
+msgstr "更改即時通訊名稱..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#  NOTE 這似乎是視窗標題
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim 網址處理器"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
-msgstr ""
+msgstr "在狀態列顯示網名"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
-msgstr ""
+msgstr "在狀態列顯示標題"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
-msgstr "éŸ³æ•ˆé¸é …"
+msgstr "傳送表情圖示"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "熒幕解像度（DPI）"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
-msgstr "放大字體"
+msgstr "基礎字體大小(點)"
 
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
@@ -7751,179 +7877,200 @@ msgstr "使用者"
 msgid "User"
 msgstr "使用者"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
-msgstr "網名(_H)："
+msgstr "é ­æ¢æ¶ˆæ¯"
 
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
-msgstr "音效"
+msgstr "歌曲"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
-msgstr ""
+msgstr "好友總數"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
-msgstr "關閉交談"
+msgstr "客戶端版本"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. 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
 msgid "Zap"
-msgstr ""
+msgstr "放電"
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s å·²å°‡ä½  [%s] åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
+msgstr "%s é›»äº†ä½ ä¸€ä¸‹ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "向 %s 放電中..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr ""
+msgstr "打人"
 
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s å·²å°‡ä½  [%s] åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
+msgstr "%s æ‰“äº†ä½ ä¸€ä¸‹ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "打 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+#. 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
 msgid "Torch"
-msgstr "主題"
+msgstr "放火"
 
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "è©²ä½¿ç”¨è€…æ‹’çµ•äº†ä½ "
+msgstr "%s ç‡’äº†ä½ ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "燒 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
+msgstr "親吻"
 
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已經登入。"
+msgstr "%s è¦ªå»äº†ä½ ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "親吻 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr ""
+msgstr "擁抱"
 
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已經登入。"
+msgstr "%s æ“æŠ±äº†ä½ ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "擁抱 %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "想睡"
+msgstr "摑掌"
 
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s å·²å°‡ä½  [%s] åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
+msgstr "%s æ‘‘äº†ä½ ä¸€å·´æŽŒï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "摑 %s 中..."
 
-#  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "已離線"
+msgstr "掐屁股"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s 已經離開。"
+msgstr "%s æŽäº†ä½ çš„å±è‚¡ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "找尋 %s 中"
+msgstr "掐 %s 的屁股中..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#  TODO Untranslated
+#. 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
 msgid "High-five"
-msgstr ""
+msgstr "High-five"
 
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已經登入。"
+msgstr "%s high-five äº†ä½ ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "High-five %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. 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
 msgid "Punk"
-msgstr ""
+msgstr "æ•´è ±"
 
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已經登入。"
+msgstr "%s æ•´è ±äº†ä½ ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "æ•´è ± %s 中..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+# NOTE「Raspberry」在這裏是指一種噴口水發出古怪聲音的動作
+# NOTE 實例請見 http://vids.myspace.com/index.cfm?fuseaction=vids.individual&VideoID=2903093
+# NOTE 中文翻譯員在2007年9月24日一致決定，暫且翻成「出怪聲」
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * 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
 msgid "Raspberry"
-msgstr ""
+msgstr "出怪聲"
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已經登入。"
+msgstr "%s å‘ä½ å‡ºæ€ªè²ï¼"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "向 %s 出怪聲中..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7953,7 +8100,7 @@ msgstr "那個目錄已經存在"
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
-#  XXX 這個太奇怪了 (^^;)
+#  XXX 這個太奇怪了 (^^;)
 #: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
@@ -7978,7 +8125,7 @@ msgstr "伺服器無法存取目錄"
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
-#  XXX 要覆查譯文
+#  XXX 要覆查譯文
 #: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "ä½ çš„ç³»çµ±ç®¡ç†å“¡ä¸å®¹è¨±é€™å€‹å‹•ä½œ"
@@ -7995,7 +8142,7 @@ msgstr "ç„¡æ³•æ–°å¢žä½ è‡ªå·±è‡³å¥½å‹æ¸
 msgid "Cannot add yourself"
 msgstr "ç„¡æ³•æ–°å¢žä½ è‡ªå·±è‡³å¥½å‹æ¸…å–®"
 
-#  TODO 不知「Master archive」有無正式譯文，也不知應如何譯
+#  TODO 不知「Master archive」有無正式譯文，也不知應如何譯
 #: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
@@ -8058,111 +8205,111 @@ msgstr "登入失敗 (%s)。"
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/novell/novell.c:247
+#  XXX 暫譯
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s åŠ è‡³ä½ çš„å¥½å‹æ¸…å–® (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
-#  FIXME 譯文有待改進
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#  FIXME 譯文有待改進
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "ç„¡æ³•æŠŠä½¿ç”¨è€…åŠ è‡³ä½ çš„ç§éš±æ¸…å–® (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s åŠ è‡³ä½ çš„æ‹’çµ•æ¸…å–® (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s åŠ è‡³ä½ çš„å…è¨±æ¸…å–® (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s ç§»é™¤è‡ªä½ çš„ç§éš±æ¸…å–® (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改私隱設定 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "電話號碼"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "個人職銜"
 
-#  NOTE 似乎無中文譯文
-#: ../libpurple/protocols/novell/novell.c:1486
+#  NOTE 似乎無中文譯文
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -8172,43 +8319,39 @@ msgstr "使用者ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "全名"
 
-#  NOTE「GroupWise」是軟件名稱，正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1637
+#  NOTE「GroupWise」是軟件名稱，正式中文名大概不會是「群組」...
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "無法使用 SSL 協定連線到伺服器。"
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s åŠ å…¥é€™å€‹äº¤è«‡ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "é‚€è«‹åŠ å…¥äº¤è«‡"
 
-#  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1899
+#  NOTE「Sent」係指發出邀請時的時間
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8219,38 +8362,32 @@ msgstr ""
 "\n"
 "時間：%s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "ä½ è¦åŠ å…¥å€‹é€™äº¤è«‡å—Žï¼Ÿ"
 
-# XXX æš«è­¯
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+# XXX 暫譯
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "ä½ å·²ç¶“è¢«ç™»å‡ºï¼Œå› ç‚ºä½ å·²åœ¨å…¶ä»–é›»è…¦ä¸Šç™»å…¥ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ç›®å‰ä¼¼ä¹Žé›¢ç·šï¼Œæ‰€ä»¥ä¸æœƒæ”¶åˆ°ä½ å‰›æ‰é€å‡ºçš„è¨Šæ¯ã€‚"
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "ç„¡æ³•é€£ç·šè‡³ä¼ºæœå™¨ã€‚è«‹è¼¸å…¥ä½ å¸Œæœ›é€£ç·šè‡³çš„ä¼ºæœå™¨çš„ä½å€ã€‚"
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "錯誤：沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2521
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -8264,33 +8401,33 @@ msgstr "這個會議已經關閉。無æ³
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "ä¼ºæœå™¨é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8299,10 +8436,10 @@ msgstr ""
 "與伺服器之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../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
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
@@ -8337,42 +8474,49 @@ msgstr "ICQ 協定模組"
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "é ç«¯ä½¿ç”¨è€…é—œé–‰äº†é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "é ç«¯ä½¿ç”¨è€…æ‹’çµ•äº†ä½ çš„è¦æ±‚ã€‚"
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "èˆ‡é ç«¯ä½¿ç”¨è€…çš„é€£ç·šçªç„¶ä¸­æ–·ï¼š<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "åœ¨èˆ‡é ç«¯ä½¿ç”¨è€…çš„é€£ç·šä¸Šæ”¶åˆ°ç„¡äº¤çš„è³‡æ–™ã€‚"
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "ç„¡æ³•èˆ‡é ç«¯ä½¿ç”¨è€…å»ºç«‹é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr "%s å˜—è©¦å‘ä½ å‚³é€ä¸€å€‹ %s 的檔案，但透過即時訊息直接傳送檔案時，這個用戶端只容許不大於 %s çš„æª”æ¡ˆï¼Œå› æ­¤ï¼Œè«‹å˜—è©¦æ”¹ç”¨æ™®é€šçš„ã€Œæª”æ¡ˆå‚³è¼¸ã€åŠŸèƒ½å‚³é€æª”æ¡ˆã€‚\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "無效錯誤"
@@ -8389,7 +8533,7 @@ msgstr "到用戶端速率"
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
-#  XXX 可能是誤譯
+#  XXX 可能是誤譯
 #: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "伺服器不存在"
@@ -8426,8 +8570,8 @@ msgstr "要求被拒"
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
+# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 #: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "SNACè² è¼‰éŽå¤§"
@@ -8436,7 +8580,7 @@ msgstr "æ¬Šé™ä¸å¤ "
 msgid "Insufficient rights"
 msgstr "æ¬Šé™ä¸å¤ "
 
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
+# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
 #: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "本地端的允許／拒絕清單"
@@ -8479,23 +8623,18 @@ msgid ""
 "is probably using a different encoding than expected.  If you know what "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
-msgstr ""
-"ï¼ˆæŽ¥æ”¶é€™å€‹è¨Šæ¯æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤ã€‚æ­£åœ¨è·Ÿä½ äº¤è«‡çš„å¥½å‹å¾ˆå¯èƒ½åœ¨ä½¿ç”¨èˆ‡ä½ æƒ³åƒä¸ä¹Žçš„å­—ç¬¦"
-"ç·¨ç¢¼ï¼›å¦‚æžœä½ çŸ¥é“é‚£æ˜¯ä»€éº¼ç·¨ç¢¼ï¼Œè«‹åœ¨ä½ çš„ AIM/ICQ 帳號的「進階設定」中的「編碼」"
-"欄位指定。）"
+msgstr "ï¼ˆæŽ¥æ”¶é€™å€‹è¨Šæ¯æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤ã€‚æ­£åœ¨è·Ÿä½ äº¤è«‡çš„å¥½å‹å¾ˆå¯èƒ½åœ¨ä½¿ç”¨èˆ‡ä½ æƒ³åƒä¸ä¹Žçš„å­—ç¬¦ç·¨ç¢¼ï¼›å¦‚æžœä½ çŸ¥é“é‚£æ˜¯ä»€éº¼ç·¨ç¢¼ï¼Œè«‹åœ¨ä½ çš„ AIM/ICQ 帳號的「進階設定」中的「編碼」欄位指定。）"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"ï¼ˆæŽ¥æ”¶é€™å€‹è¨Šæ¯æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤ã€‚å¯èƒ½ä½ å’Œ %s 選用了不同的編碼，也有可能是 %s 在使"
-"用有問題的用戶端程式。）"
+msgstr "ï¼ˆæŽ¥æ”¶é€™å€‹è¨Šæ¯æ™‚ç™¼ç”Ÿäº†éŒ¯èª¤ã€‚å¯èƒ½ä½ å’Œ %s 選用了不同的編碼，也有可能是 %s 在使用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -8504,21 +8643,21 @@ msgstr "聲音"
 msgid "Voice"
 msgstr "聲音"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
+# NOTE 將「直接消息」改譯為「即時訊息」
 #: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -8538,7 +8677,7 @@ msgstr "ICQ 式直接連線"
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
+# NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
 #: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP 使用者"
@@ -8547,7 +8686,7 @@ msgstr "ICQ RTF"
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-# NOTE「Nihilist」是什麼呢？連開發者都不知道
+# NOTE「Nihilist」是什麼呢？連開發者都不知道
 # NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
 # NOTE (18:07:23) KingAnt: Yeah, what he said
 # NOTE (18:17:08) wing: capability of all 0s?
@@ -8574,7 +8713,7 @@ msgstr "ICQ UTF8"
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-# NOTE 這似乎是一種掌上電腦的牌子
+# NOTE 這似乎是一種掌上電腦的牌子
 #: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
@@ -8583,12 +8722,12 @@ msgstr "有保安功能"
 msgid "Security Enabled"
 msgstr "有保安功能"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "視像聊天"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
@@ -8597,56 +8736,50 @@ msgstr "動態視像"
 msgid "Live Video"
 msgstr "動態視像"
 
-#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
+#  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
 #: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5830
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5865
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5851
 msgid "Occupied"
 msgstr "忙碌"
 
-# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "å…è¨±å…¶ä»–ä½¿ç”¨è€…åœ¨ç¶²çµ¡ä¸ŠæŸ¥çœ‹ä½ ç›®å‰çš„ç‹€æ…‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "隱身"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -8685,141 +8818,148 @@ msgstr "完成連線"
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1262
+#, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"無法登入：無法以 %s èº«ä»½ç™»å…¥ï¼Œå› ç‚ºé€™å€‹å¸³è™Ÿæ˜¯ç„¡æ•ˆçš„ã€‚å¸³è™Ÿå¿…é ˆä»¥è‹±æ–‡å­—æ¯èµ·å§‹ï¼Œ"
-"並只含英文字母、數字及空白；或者只由數字組成。"
+msgstr "無法登入：無法以 %s èº«ä»½ç™»å…¥ï¼Œå› ç‚ºé€™å€‹å¸³è™Ÿæ˜¯ç„¡æ•ˆçš„ã€‚å¸³è™Ÿå¿…é ˆç‚ºæœ‰æ•ˆé›»éƒµåœ°å€ï¼›æˆ–è€…ä»¥è‹±æ–‡å­—æ¯èµ·å§‹ï¼Œä¸¦åªå«è‹±æ–‡å­—æ¯ã€æ•¸å­—åŠç©ºç™½ï¼›æˆ–è€…åªç”±æ•¸å­—çµ„æˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
+#. Suspended account
 #: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "ä½ çš„å¸³è™Ÿç›®å‰åœç”¨ä¸­ã€‚"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
 #: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"ä½ çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç­‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœä½ ä¾ç„¶ç¹¼çºŒå˜—è©¦é€£ç·šï¼Œ"
-"é‚£éº¼ä½ çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
+msgstr "ä½ çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç­‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœä½ ä¾ç„¶ç¹¼çºŒå˜—è©¦é€£ç·šï¼Œé‚£éº¼ä½ çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "ä½ æ‰€ä½¿ç”¨çš„ç”¨æˆ¶ç«¯ç¨‹å¼å¤ªéŽè€èˆŠã€‚è«‹åˆ° %s æ›´æ–°"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "ä½ æ‰€è¼¸å…¥çš„ SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
-msgstr ""
-"ä½ å¯èƒ½æœƒçŸ­æ™‚é–“ä¸­æ–·é€£ç·šã€‚ä½ å¯èƒ½æœƒæƒ³åœ¨é€™å€‹å•é¡Œè¢«ä¿®æ­£å¾Œä½¿ç”¨ TOC。請到 %s 看看有"
-"沒有更新。"
+msgstr "ä½ å¯èƒ½æœƒçŸ­æ™‚é–“ä¸­æ–·é€£ç·šã€‚ä½ å¯èƒ½æœƒæƒ³åœ¨é€™å€‹å•é¡Œè¢«ä¿®æ­£å¾Œä½¿ç”¨ TOC。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "ä½ å¯èƒ½æœƒçŸ­æ™‚é–“ä¸­æ–·é€£ç·šã€‚è«‹åˆ° %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "è«‹é€šéŽæˆ‘çš„èªè­‰è¦æ±‚ï¼Œå¥½è®“æˆ‘å¯ä»¥å°‡ä½ åŠ å…¥æˆ‘çš„å¥½å‹æ¸…å–®ä¸­ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "æ²’æœ‰çµ¦äºˆåŽŸå› ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8829,17 +8969,17 @@ msgstr ""
 "使用者 %u å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†ä½ å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u åŒæ„äº†ä½ å°‡å…¶åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8852,7 +8992,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8865,7 +9005,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8878,38 +9018,38 @@ msgstr ""
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "ä½ æƒ³å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥åˆ°ä½ çš„å¥½å‹åå–®ä¸­å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "åŠ å…¥(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒæ˜¯ç„¡æ•ˆçš„ã€‚"
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå¤ªå¤§äº†ã€‚"
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘å¤ªå¤§äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8918,22 +9058,22 @@ msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€
 msgstr[0] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå€‘å‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 
-# XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2623
+# XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä»–ï¼ˆå¥¹ï¼‰å¤ªé‚ªæƒ¡äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä½ å¤ªé‚ªæƒ¡äº†ã€‚"
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºä½ å¤ªé‚ªæƒ¡äº†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8941,214 +9081,208 @@ msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€
 msgstr[1] "ä½ éºå¤±äº† %hu 個由 %s é€ä¾†çš„è¨Šæ¯ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "åŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資料：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "上線自"
 
-# XXX æ”¹è­¯ã€Œè¨»å†Šæ—¥æœŸã€æœƒå¦æ¯”è¼ƒé€šé †ï¼Ÿ
-#: ../libpurple/protocols/oscar/oscar.c:2901
+# XXX 改譯「註冊日期」會否比較通順？
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "ä½ çš„ AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "ã€Œç„¡æ³•é¡¯ç¤ºä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒåŒ…å«äº†ç„¡æ•ˆå­—ç¬¦ã€‚ã€"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"ä½ æœ€è¿‘åšçš„ä¸€å€‹å‹•ä½œç„¡æ³•å®Œæˆï¼Œå› ç‚ºä½ å·²ç¶“é”åˆ°ç™¼é€è¨Šæ¯é€ŸçŽ‡çš„ä¸Šé™ã€‚è«‹ç­‰å¾…åç§’å¾Œå†"
-"試一次。"
+msgstr "ä½ æœ€è¿‘åšçš„ä¸€å€‹å‹•ä½œç„¡æ³•å®Œæˆï¼Œå› ç‚ºä½ å·²ç¶“é”åˆ°ç™¼é€è¨Šæ¯é€ŸçŽ‡çš„ä¸Šé™ã€‚è«‹ç­‰å¾…åç§’å¾Œå†è©¦ä¸€æ¬¡ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ä½ å·²ç¶“ç”±èŠå¤©å®¤ %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "流動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "å€‹äººç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "ç¶²é "
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "工作資訊"
 
-# XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3877
+# XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "ä½ æ‡‰è©²æœƒæ”¶åˆ°ä¸€å°è¦æ±‚å° %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ ¼å¼åŒ–å¸³è™Ÿï¼Œå› ç‚ºè¦æ±‚çš„å¸³è™Ÿèˆ‡åŽŸæœ¬çš„ä¸åŒã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ ¼å¼åŒ–å¸³è™Ÿï¼Œå› ç‚ºå®ƒæ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ ¼å¼åŒ–å¸³è™Ÿï¼Œå› ç‚ºè¦æ±‚çš„å¸³è™Ÿå¤ªé•·ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»å­éƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹å¸³è™Ÿå°šæœ‰è¦æ±‚ç­‰å¾…è™•ç†ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
-msgstr ""
-"錯誤 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»å­éƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹é›»å­éƒµä»¶åœ°å€å’Œå¤ªå¤šçš„å¸³è™Ÿç”¢ç”Ÿé—œé€£ã€‚"
+msgstr "錯誤 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»å­éƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹é›»å­éƒµä»¶åœ°å€å’Œå¤ªå¤šçš„å¸³è™Ÿç”¢ç”Ÿé—œé€£ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04xï¼šç„¡æ³•æ”¹è®Šé›»å­éƒµä»¶åœ°å€ï¼Œå› ç‚ºé€™å€‹é›»å­éƒµä»¶åœ°å€æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "ç„¡æ³•å‚³é€å³æ™‚è¨Šæ¯åœ–åƒï¼›è¦å‚³é€å³æ™‚è¨Šæ¯åœ–åƒï¼Œå¿…é ˆèˆ‡å°æ–¹ç›´æŽ¥é€£ç·šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
-msgstr ""
-"ä½ åœ¨æœªç™»å…¥å®Œæˆå‰è¦æ±‚ä¿®æ”¹ä½ çš„å€‹äººè³‡æ–™ï¼Œæ‰€ä»¥é€™äº›è³‡è¨Šä¸¦æœªè¢«ä¿®æ”¹ã€‚è«‹åœ¨å®Œæˆç™»å…¥å¾Œ"
-"再重新進行設定。"
+msgstr "ä½ åœ¨æœªç™»å…¥å®Œæˆå‰è¦æ±‚ä¿®æ”¹ä½ çš„å€‹äººè³‡æ–™ï¼Œæ‰€ä»¥é€™äº›è³‡è¨Šä¸¦æœªè¢«ä¿®æ”¹ã€‚è«‹åœ¨å®Œæˆç™»å…¥å¾Œå†é‡æ–°é€²è¡Œè¨­å®šã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9159,11 +9293,11 @@ msgstr[1] "個人資料的長度超出äº
 msgstr[0] "個人資料的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資料的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "個人資料過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9174,93 +9308,84 @@ msgstr[1] "離開訊息的長度超出äº
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4642
+#, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"å› ç‚ºé€™å€‹å¸³è™Ÿä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„å¸³è™Ÿï¼Œæ‰€ä»¥ç„¡æ³•å°‡å¥½å‹ã€Œ%sã€åŠ å…¥æ¸…å–®ä¸­ã€‚å¸³è™Ÿå¿…é ˆä»¥è‹±"
-"æ–‡å­—æ¯ç‚ºé–‹é ­ï¼ŒåŒæ™‚ç”±ã€Œè‹±æ–‡å­—æ¯ã€ã€ã€Œæ•¸å­—ã€å’Œã€Œç©ºç™½ã€æ‰€çµ„æˆï¼Œæˆ–è€…å–®ç´”ä»¥ã€Œæ•¸"
-"字」組成。"
+msgstr "å› ç‚ºé€™å€‹å¸³è™Ÿä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„å¸³è™Ÿï¼Œæ‰€ä»¥ç„¡æ³•å°‡å¥½å‹ã€Œ%sã€åŠ å…¥æ¸…å–®ä¸­ã€‚å¸³è™Ÿå¿…é ˆç‚ºæœ‰æ•ˆé›»éƒµåœ°å€ï¼›æˆ–è€…å¿…é ˆä»¥è‹±æ–‡å­—æ¯ç‚ºé–‹é ­ï¼ŒåŒæ™‚ç”±ã€Œè‹±æ–‡å­—æ¯ã€ã€ã€Œæ•¸å­—ã€å’Œã€Œç©ºç™½ã€æ‰€çµ„æˆï¼Œæˆ–è€…å–®ç´”ä»¥ã€Œæ•¸å­—ã€çµ„æˆã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "ç„¡æ³•åŠ å…¥"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4764
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
-msgstr ""
-"AIM ä¼ºæœå™¨æš«æ™‚ç„¡æ³•é€å‡ºä½ çš„å¥½å‹æ¸…å–®ã€‚ä¸éŽé€™å€‹å¥½å‹æ¸…å–®ä¸¦æ²’æœ‰éºå¤±ï¼Œå¯èƒ½å¯ä»¥åœ¨å¹¾"
-"個小時後取得。"
+"list is not lost, and will probably become available in a few minutes."
+msgstr "AIM ä¼ºæœå™¨æš«æ™‚ç„¡æ³•é€å‡ºä½ çš„å¥½å‹æ¸…å–®ã€‚ä¸éŽé€™å€‹å¥½å‹æ¸…å–®ä¸¦æ²’æœ‰éºå¤±ï¼Œå¯èƒ½å¯ä»¥åœ¨å¹¾åˆ†é˜å¾Œå–å¾—ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
-msgstr ""
-"å› ç‚ºä½ çš„å¥½å‹æ³•å–®ä¸­æœ‰å¤ªå¤šçš„å¥½å‹ï¼Œæ‰€ä»¥æ²’æœ‰è¾¦æ³•åŠ å…¥å¥½å‹ %s。請在移除部份好友後重"
-"試。"
+msgstr "å› ç‚ºä½ çš„å¥½å‹æ³•å–®ä¸­æœ‰å¤ªå¤šçš„å¥½å‹ï¼Œæ‰€ä»¥æ²’æœ‰è¾¦æ³•åŠ å…¥å¥½å‹ %s。請在移除部份好友後重試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5109
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "æŒ‡ä»¤åŸ·è¡Œå¤±æ•—ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
+msgstr "無法把 %s åŠ å…¥å¥½å‹æ¸…å–®ï¼ŒåŽŸå› ä¸æ˜Žã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
-msgstr ""
-"使用者 %s å·²ç¶“å…è¨±ä½ åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ä¸­ã€‚ä½ æ˜¯ä¸æ˜¯ä¹Ÿè¦å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥"
-"呢？"
+msgstr "使用者 %s å·²ç¶“å…è¨±ä½ åŠ å…¥åˆ°ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ä¸­ã€‚ä½ æ˜¯ä¸æ˜¯ä¹Ÿè¦å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å‘¢ï¼Ÿ"
 
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5186
+# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s å…è¨±äº†ä½ å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
-# NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5260
+# NOTE 這是我們發出的認證要求被對方允許時顯示的
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9270,198 +9395,196 @@ msgstr ""
 "使用者 %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œæ‹’çµ•äº†ä½ å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-# NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5300
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
+# NOTE: KingAnt 提供的字義有些不同，暫時不予理會
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "é »é“è™Ÿç¢¼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息圖像；AIM 聊天並不支援即時訊息圖像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "離開訊息"
 
-# XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5574
+# XXX 好像不對，又好像沒問題
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
-#  NOTE 蘋果自己的中文網站只寫「iTunes Store」（英文）了事 :P
+#  NOTE 蘋果自己的中文網站只寫「iTunes Store」（英文）了事 :P
 #  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:5774
+#  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "ä½ é¸æ“‡äº†èˆ‡ %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "é€™æ¨£å°‡æœƒæ›éœ²å‡ºä½ çš„ IP ä½å€ï¼Œå› æ­¤å¯èƒ½æœƒæœ‰ç§éš±ä¸Šçš„é¢¨éšªã€‚ä½ æƒ³è¦ç¹¼çºŒå—Žï¼Ÿ"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:6002
+# NOTE 將「直接消息」改譯為「即時訊息」
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6083
+# NOTE Require意為「需要」，不是「要求」
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "å…è¨±å…¶ä»–ä½¿ç”¨è€…åœ¨ç¶²çµ¡ä¸ŠæŸ¥çœ‹ä½ ç›®å‰çš„ç‹€æ…‹ï¼ˆæœƒå°Žè‡´ä½ æ”¶åˆ°åžƒåœ¾è¨Šæ¯ï¼ï¼‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "ICQ ç§éš±é¸é Š"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "æ–°çš„æ ¼å¼æ˜¯ç„¡æ•ˆçš„ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "å¸³è™Ÿæ ¼å¼åŒ–åªèƒ½æ”¹è®Šå¤§å¯«ä»¥åŠç©ºç™½ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "更改地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ä½ ä¸¦æ²’æœ‰åœ¨ç­‰å¾…é©—è­‰</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "ä½ ç›®å‰æ­£åœ¨ç­‰å¾…ä¸‹åˆ—å¥½å‹çš„èªè­‰"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
-msgstr ""
-"ä½ å¯ä»¥é‡æ–°è¦æ±‚é€™äº›å¥½å‹çš„èªè­‰ï¼Œåªè¦åœ¨å¥½å‹æ¸…å–®ä¸­ä»¥æ»‘é¼ å³éµé»žæ“Šä»–å€‘ï¼Œç„¶å¾Œé¸æ“‡"
-"「要求重新認證」。"
+msgstr "ä½ å¯ä»¥é‡æ–°è¦æ±‚é€™äº›å¥½å‹çš„èªè­‰ï¼Œåªè¦åœ¨å¥½å‹æ¸…å–®ä¸­ä»¥æ»‘é¼ å³éµé»žæ“Šä»–å€‘ï¼Œç„¶å¾Œé¸æ“‡ã€Œè¦æ±‚é‡æ–°èªè­‰ã€ã€‚"
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (é€éŽç¶²é )..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "修改密碼 (é€éŽç¶²é )"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (é€éŽç¶²é )"
 
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "è¨­å®šç§éš±é¸é …..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
-msgstr "æ ¹æ“šè³‡è¨Šå°‹æ‰¾å¥½å‹"
+msgstr "æ ¹æ“šç…§è³‡è¨Šå°‹æ‰¾å¥½å‹"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」羣組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "é¡¯ç¤ºä½ é–’ç½®å¤šä¹…æ™‚é–“"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9469,34 +9592,31 @@ msgstr ""
 "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
 "ï¼ˆè¼ƒæ…¢ï¼Œä½†ä¸æœƒæš´éœ²ä½ çš„ IP 位址）"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s；%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
-msgstr ""
-"é€™å€‹è¦æ±‚å°‡æœƒåœ¨å…©éƒ¨é›»è…¦é–“å»ºç«‹èµ·ç›´æŽ¥é€£ç·šï¼Œè€Œé€™æ˜¯åœ¨å‚³é€å³æ™‚è¨Šæ¯åœ–åƒæ™‚æ‰€å¿…é ˆçš„ã€‚"
-"é€™æ¨£å°‡æœƒæ›éœ²ä½ çš„ IP ä½å€ï¼Œå› æ­¤å¯èƒ½æœƒæœ‰ç§éš±æ–¹é¢çš„é¢¨éšªã€‚"
+msgstr "é€™å€‹è¦æ±‚å°‡æœƒåœ¨å…©éƒ¨é›»è…¦é–“å»ºç«‹èµ·ç›´æŽ¥é€£ç·šï¼Œè€Œé€™æ˜¯åœ¨å‚³é€å³æ™‚è¨Šæ¯åœ–åƒæ™‚æ‰€å¿…é ˆçš„ã€‚é€™æ¨£å°‡æœƒæ›éœ²ä½ çš„ IP ä½å€ï¼Œå› æ­¤å¯èƒ½æœƒæœ‰ç§éš±æ–¹é¢çš„é¢¨éšªã€‚"
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9652,28 +9772,28 @@ msgstr "其他"
 msgid "Other"
 msgstr "其他"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "修改好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "æˆåŠŸä¿®æ”¹äº†ä½ çš„å¥½å‹è³‡è¨Šã€‚"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr "自選的表情圖案暫時未獲支援，請自 %s 選取圖案。"
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "無效的 QQ 表情"
 
@@ -9691,14 +9811,16 @@ msgstr "拒絕"
 msgid "Reject request"
 msgstr "拒絕"
 
+#  NOTE 這個「你」字沒有打錯，主要是法文及德文的譯者都採用「你」
+#  NOTE（法文「tu」、德文「du」）而不是「您」（「vous」、「Sie」），
+#  NOTE 中文採用「你」應該也是恰當的。
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
 #: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
-msgstr "å°ä¸èµ·ï¼Œæˆ‘å’Œä½ åˆä¸ä¾†â€¦â€¦"
+msgstr "å°ä¸èµ·ï¼Œæˆ‘å’Œä½ ï¼Œåˆä¸ä¾†çš„â€¦â€¦"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
 msgstr "連同認證要求的新增好友失敗"
 
@@ -9709,9 +9831,8 @@ msgstr "ä½ æˆåŠŸç§»é™¤äº†ä¸€å€‹å¥½å‹"
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "ä½ æˆåŠŸå¾žä¸€å€‹å¥½å‹çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤äº†ä½ è‡ªå·±"
+msgstr "ä½ æˆåŠŸå¾žå°æ–¹çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤äº†ä½ è‡ªå·±"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
@@ -9740,7 +9861,7 @@ msgstr "送出"
 msgstr "送出"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
 msgstr "成功將 %d åŠ å…¥å¥½å‹æ¸…å–®"
 
@@ -9777,17 +9898,16 @@ msgstr "QQ ç¾£"
 msgstr "QQ ç¾£"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "請輸入外部 Group ID"
 
-# NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
+# NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "ä½ åªå¯æœå°‹æ°¸ä¹…ç¾£çµ„\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "User %d requested to join group %d"
 msgstr "使用者 %d è¦æ±‚åŠ å…¥ç¾£çµ„ %d"
 
@@ -9819,31 +9939,30 @@ msgstr "允許"
 msgstr "允許"
 
 #: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr "管理人 %d æ‹’çµ•äº†ä½ åŠ å…¥ç¾£çµ„ %d"
+msgstr "管理人 %2$d æ‹’çµ•äº†ä½ åŠ å…¥ç¾£çµ„ %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr "管理人 %d å…è¨±äº†ä½ åŠ å…¥ç¾£çµ„ %d"
+msgstr "管理人 %2$d å…è¨±äº†ä½ åŠ å…¥ç¾£çµ„ %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "ä½  [%d] 退出了羣組「%d」"
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "羣組「%2$dã€æ–°å¢žäº†ä½  [%1$d]"
+msgstr "ä½  [%d] å·²ç¶“è¢«åŠ å…¥ç¾£çµ„ \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "羣組已新增至好友清單。"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
 msgid "I am not a member"
 msgstr "我不是成員"
 
@@ -9868,7 +9987,6 @@ msgstr "é€™ç¾£çµ„ä¸å®¹è¨±å¤–äººåŠ å…¥"
 msgstr "é€™ç¾£çµ„ä¸å®¹è¨±å¤–äººåŠ å…¥"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "ä½ æˆåŠŸé›¢é–‹ç¾£çµ„"
 
@@ -9877,19 +9995,16 @@ msgstr "QQ 羣組認證"
 msgstr "QQ 羣組認證"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "QQ ä¼ºæœå™¨æŽ¥å—äº†ä½ çš„èªè­‰"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
 msgstr "指定的羣組 ID 在有效範圍之外"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "ä½ ç¢ºå®šè¦åˆªé™¤ %s？"
+msgstr "ä½ ç¢ºå®šè¦é›¢é–‹ç¾£çµ„ï¼Ÿ"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9909,24 +10024,20 @@ msgstr "羣組操作錯誤"
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
 msgid "Enter your reason:"
 msgstr "è«‹è¼¸å…¥åŽŸå› ï¼š"
 
-#  NOTE QQ「member」應是「成員」
+#  NOTE QQ「member」應是「成員」
 #: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
 msgid "You have successfully modified Qun member"
 msgstr "成功更改了羣的一個成員"
 
-# FIXME æš«è­¯ ambrose 20070415
+# FIXME 暫譯 ambrose 20070415
 #: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
 msgid "You have successfully modified Qun information"
 msgstr "成功更改了羣的資訊"
 
@@ -9946,132 +10057,123 @@ msgstr "系統訊息"
 msgid "System Message"
 msgstr "系統訊息"
 
-# TODO 覆查譯文 - 20061028
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "無法取得名稱：%s"
+msgstr "送出即時訊息失敗。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
-msgstr "讀取錯誤"
+msgstr "Keep Alive 錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "連線開啟錯誤"
+msgstr "取得登入符記途中發生錯誤"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "無法登入，請檢查除錯記錄"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-# XXX 問題：
-# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
-# XXX libgaim/account.c - 「Unknownã€æŒ‡ä¸çŸ¥é“æ˜¯ä»€éº¼é€šè¨Šå”å®šï¼Œè­¯ã€Œä¸æ˜Žã€è¼ƒå¥½ï¼ˆå› ç‚ºä¸€å®šã€Œæ›¾ç¶“çŸ¥é“ã€ï¼Œ
-# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
-# XXX libgaim/protocols/* - 「Unknownã€æŒ‡ä¸æ˜Žçš„å¥½å‹ç‹€æ…‹ï¼Œå¯èƒ½æ˜¯æŒ‡ã€Œä¸æ˜Žã€ï¼ˆé€šè¨Šç³»çµ±å›žå ±çš„ç‹€æ…‹æ˜¯ã€Œä¸æ˜Žã€ï¼‰
-# XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
+# XXX 問題：
+# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值，譯「未知」較好
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定，譯「不明」較好（因為一定「曾經知道」，
+# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白）
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
+# XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
-msgstr "IP 位址"
+msgstr "TCP 位址"
 
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
-msgstr "IP 位址"
+msgstr "UDP 位址"
 
-#  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:242
+#  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "成長階段"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "名稱無效"
 
-#  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:439
+#  NOTE 參見 qq.h
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址：</b>%s：%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間：</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr "伺服器資訊"
+msgstr "設定我的資訊"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "顯示登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "離開這個 QQ 羣 (Qun)"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "封鎖這個好友"
 
@@ -10085,20 +10187,19 @@ msgstr "封鎖這個好友"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
-msgstr "連線中"
+msgstr "使用 TCP 連結"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
@@ -10117,19 +10218,18 @@ msgstr "%d 取消了「%s」的傳送"
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "連線中斷"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+# FIXME 譯文有待改進  - 20070912 acli
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
 msgid "Do you want to add this buddy?"
-msgstr "ä½ æƒ³å°‡é€™å€‹ä½¿ç”¨è€…åŠ å…¥åˆ°ä½ çš„å¥½å‹åå–®ä¸­å—Žï¼Ÿ"
+msgstr "ä½ è¦åŠ å…¥é€™å€‹ä½¿ç”¨è€…åˆ°å¥½å‹æ¸…å–®ä¸­å—Žï¼Ÿ"
 
 #. only need to get value
 #: ../libpurple/protocols/qq/sys_msg.c:166
@@ -10144,9 +10244,9 @@ msgstr "ä½ è¦å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥ä½ çš
 msgstr "ä½ è¦å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥ä½ çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s å°‡ä½ åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ã€‚"
+msgstr "%s å°‡ä½  [%s] åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®ã€‚"
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
@@ -10154,15 +10254,15 @@ msgstr "使用者「%sã€æ‹’çµ•äº†ä½ çš„
 msgstr "使用者「%sã€æ‹’çµ•äº†ä½ çš„è¦æ±‚"
 
 #: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "User %s approved your request"
-msgstr "使用者「%sã€å…è¨±äº†ä½ çš„è¦æ±‚"
+msgstr "使用者 %s å…è¨±äº†ä½ çš„è¦æ±‚"
 
 #. TODO: this should go through purple_account_request_authorization()
 #: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
-msgstr "%s æƒ³è¦å°‡ä½ ï¼ˆ%sï¼‰åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
+msgstr "%s æƒ³è¦å°‡ä½  [%s] åŠ å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å¥½å‹æ¸…å–®"
 
 #: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
@@ -10174,280 +10274,272 @@ msgstr "%s ä¸åœ¨ä½ çš„å¥½å‹æ¸…å–®å…§"
 msgid "%s is not in your buddy list"
 msgstr "%s ä¸åœ¨ä½ çš„å¥½å‹æ¸…å–®å…§"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>羣組名稱：</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 羣組 ID：</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "關於羣組 %s 的資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Notes 通訊錄資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "邀請整個羣組進入會議室..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+# NOTE 見cnscode.org.tw
+# FIXME 譯文有待改進
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
-msgstr "傳送 Handshake"
+msgstr "傳送交握中"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+# NOTE 見cnscode.org.tw
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "等待 Handshake 回應"
+msgstr "等待交握回應"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+# NOTE 見cnscode.org.tw
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Handshake收到回應，送出登入要求"
+msgstr "收到交握回應，送出登入要求中"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "等待登入要求的回應"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
-msgstr "重新導向登入"
+msgstr "登入已被重新導向"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
-msgstr "強行登入"
+msgstr "強行登入中"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "登入要求收到回應"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#  XXX 暫譯
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "啟動服務"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "在伺服器「%s」上，有 Sametime 管理人發出了下列通告"
 
-# FIXME é€™å¥½åƒä¸é€šé † - 20061025
-#: ../libpurple/protocols/sametime/sametime.c:1650
+# FIXME 這好像不通順 - 20061025
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "連線重置"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "讀取 Socket 時發生錯誤；%s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "會議室關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "無法送出訊息："
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "喇叭"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/sametime/sametime.c:3231
+# XXX 暫譯
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "視像"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "支援"
 
-#  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#  XXX 怪
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題，同時發出一個邀請訊息給%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "建立"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "現有會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3465
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
-msgstr ""
-"從下方的清單中選取一個會議室，同時發出邀請給使用者%sã€‚å¦‚æžœä½ æƒ³é–‹å•Ÿä¸€å€‹æ–°çš„æœƒ"
-"è­°å®¤ï¼Œä¸¦ä¸”é‚€è«‹é€™å€‹ä½¿ç”¨è€…åŠ å…¥ï¼Œä½ å¯ä»¥é¸æ“‡ã€Œé–‹å•Ÿæ–°æœƒè­°å®¤ã€é¸é …ã€‚"
+msgstr "從下方的清單中選取一個會議室，同時發出邀請給使用者%sã€‚å¦‚æžœä½ æƒ³é–‹å•Ÿä¸€å€‹æ–°çš„æœƒè­°å®¤ï¼Œä¸¦ä¸”é‚€è«‹é€™å€‹ä½¿ç”¨è€…åŠ å…¥ï¼Œä½ å¯ä»¥é¸æ“‡ã€Œé–‹å•Ÿæ–°æœƒè­°å®¤ã€é¸é …ã€‚"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3471
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
-#  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#  XXX 要覆查 - 20061029
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社羣伺服器"
 
-# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3636
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
-msgstr ""
-"Meanwhile 帳號「%s」尚未設定主機名稱或 IP 位址，請在下面輸入其一，以便繼續登"
-"入。"
+msgstr "Meanwhile 帳號「%s」尚未設定主機名稱或 IP 位址，請在下面輸入其一，以便繼續登入。"
 
-# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3641
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體，不是連接詞
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社羣伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "連線"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知（0x%04x）<br>"
 
-#  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#  XXX 要覆查
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式（如已知）"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明確的使用者 ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者，以便新增至好友清單"
-"內。"
+msgstr "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "選擇使用者"
 
-#  TODO 請覆查，譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#  TODO 請覆查，譯文有待改進
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者：找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
-msgstr ""
-"「%sã€èˆ‡ä½ åœ¨ Sametime ç¤¾ç¾£ä¸­çš„ä»»ä½•ä½¿ç”¨è€…å¸³è™Ÿä¸ç¬¦ã€‚å®ƒå°‡å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­è¢«ç§»"
-"除。"
+msgstr "「%sã€èˆ‡ä½ åœ¨ Sametime ç¤¾ç¾£ä¸­çš„ä»»ä½•ä½¿ç”¨è€…å¸³è™Ÿä¸ç¬¦ã€‚å®ƒå°‡å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­è¢«ç§»é™¤ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "無法新增使用者"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10456,167 +10548,161 @@ msgstr ""
 "讀取檔案 %s 發生錯誤；\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "å¥½å‹æ¸…å–®å­˜æ”¾æ–¼é ç«¯"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "無法新增羣組：羣組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "羣組名稱「%sã€å·²ç¶“å­˜åœ¨æ–¼ä½ çš„å¥½å‹æ¸…å–®ä¸­ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "無法新增羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "å¯èƒ½ç›¸ç¬¦çš„é …ç›®"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
-msgstr ""
-"「%s」可能參考到下列的 Notes é€šè¨ŠéŒ„ç¾£çµ„ã€‚è«‹è‡ªä¸‹æ–¹é¸å–æ­£ç¢ºçš„ç¾£çµ„ï¼Œä»¥åŠ å…¥ä½ çš„å¥½"
-"友清單。"
+msgstr "「%s」可能參考到下列的 Notes é€šè¨ŠéŒ„ç¾£çµ„ã€‚è«‹è‡ªä¸‹æ–¹é¸å–æ­£ç¢ºçš„ç¾£çµ„ï¼Œä»¥åŠ å…¥ä½ çš„å¥½å‹æ¸…å–®ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "無法新增羣組：找不到羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "åœ¨ä½ çš„ Sametime 社羣中，並沒有任何與「%s」相符的 Notes 通訊錄羣組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
-msgstr ""
-"輸入 Notes é€šè¨ŠéŒ„ç¾£çµ„åç¨±æ–¼æ¬„ä½ä¸­ï¼Œä»¥æ–°å¢žé€™å€‹ç¾£çµ„åŠå®ƒæ‰€å±¬çš„æˆå“¡åˆ°ä½ çš„å¥½å‹æ¸…å–®"
-"中。"
+msgstr "輸入 Notes é€šè¨ŠéŒ„ç¾£çµ„åç¨±æ–¼æ¬„ä½ä¸­ï¼Œä»¥æ–°å¢žé€™å€‹ç¾£çµ„åŠå®ƒæ‰€å±¬çš„æˆå“¡åˆ°ä½ çš„å¥½å‹æ¸…å–®ä¸­ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
-msgstr ""
-"「%sã€å¯èƒ½æŒ‡ä¸‹åˆ—ä»»ä½•ä¸€å€‹ä½¿ç”¨è€…ã€‚ä½ å¯ä½¿ç”¨ä¸‹é¢çš„æŒ‰ç´ï¼ŒæŠŠä»–ï¼ˆå¥¹ï¼‰å€‘æ–°å¢žè‡³å¥½å‹æ¸…"
-"單內，或向他（她）們發出訊息。"
+msgstr "「%sã€å¯èƒ½æŒ‡ä¸‹åˆ—ä»»ä½•ä¸€å€‹ä½¿ç”¨è€…ã€‚ä½ å¯ä½¿ç”¨ä¸‹é¢çš„æŒ‰ç´ï¼ŒæŠŠä»–ï¼ˆå¥¹ï¼‰å€‘æ–°å¢žè‡³å¥½å‹æ¸…å–®å…§ï¼Œæˆ–å‘ä»–ï¼ˆå¥¹ï¼‰å€‘ç™¼å‡ºè¨Šæ¯ã€‚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%sã€èˆ‡ä½ åœ¨ Sametime 社羣中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID æ–¼ä¸‹æ–¹çš„æ¬„ä½ï¼Œä¾†æŸ¥è©¢ä½  Sametime 社羣中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入（忽略伺服器重新導向）"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -10745,8 +10831,8 @@ msgstr "設定即時訊息密碼"
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10755,8 +10841,8 @@ msgstr "取得公開密碼匙"
 msgstr "取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10764,17 +10850,17 @@ msgstr "無法取得公開密碼匙"
 msgstr "無法取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "顯示公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公開密碼匙"
@@ -10782,9 +10868,9 @@ msgstr "無法載入公開密碼匙"
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10796,7 +10882,7 @@ msgstr "使用者資訊"
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10814,264 +10900,258 @@ msgid ""
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
-msgstr ""
-"ç›´è‡³ä½ åŒ¯å…¥å¥½å‹çš„å…¬é–‹å¯†ç¢¼åŒ™ï¼Œä½ å°‡ç„¡æ³•æ”¶åˆ°è©²å¥½å‹çš„å¥½å‹é€šçŸ¥ã€‚è¦å–å¾—å…¬é–‹å¯†ç¢¼åŒ™ï¼Œ"
-"用「取得公開密碼匙」指令即可。"
+msgstr "ç›´è‡³ä½ åŒ¯å…¥å¥½å‹çš„å…¬é–‹å¯†ç¢¼åŒ™ï¼Œä½ å°‡ç„¡æ³•æ”¶åˆ°è©²å¥½å‹çš„å¥½å‹é€šçŸ¥ã€‚è¦å–å¾—å…¬é–‹å¯†ç¢¼åŒ™ï¼Œç”¨ã€Œå–å¾—å…¬é–‹å¯†ç¢¼åŒ™ã€æŒ‡ä»¤å³å¯ã€‚"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "é–‹å•Ÿ..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網絡上"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr ""
-"è¦æ–°å¢žå¥½å‹ï¼Œå¿…é ˆåŒ¯å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å…¬é–‹å¯†ç¢¼åŒ™ã€‚è¦åŒ¯å…¥å…¬é–‹å¯†ç¢¼åŒ™ï¼Œè«‹æŒ‰ã€ŒåŒ¯å…¥ã€ã€‚"
+msgstr "è¦æ–°å¢žå¥½å‹ï¼Œå¿…é ˆåŒ¯å…¥ä»–ï¼ˆå¥¹ï¼‰çš„å…¬é–‹å¯†ç¢¼åŒ™ã€‚è¦åŒ¯å…¥å…¬é–‹å¯†ç¢¼åŒ™ï¼Œè«‹æŒ‰ã€ŒåŒ¯å…¥ã€ã€‚"
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr ""
-"超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者，以便新增至好友清"
-"單內。"
+msgstr "超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
-msgstr ""
-"超過一個使用者使用同一名稱。請從清單選擇正確的使用者，以便新增至好友清單內。"
+msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者，以便新增至好友清單內。"
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我！"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "機械人"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "開心"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "時區"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "清除即時訊息密碼匙"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "要交換密碼匙之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "取得公開密碼匙..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "從網絡上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
@@ -11088,7 +11168,7 @@ msgstr "é »é“ %s 不在網絡上"
 msgstr "é »é“ %s 不在網絡上"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11138,63 +11218,58 @@ msgstr "<br><b>é »é“ä¸»é¡Œï¼š</b><br>%s
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>é »é“æ¨¡å¼ï¼š</b>"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公開密碼匙指紋：</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公開密碼匙指紋可讀版本 (Babbleprint)：</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "æ–°å¢žé »é“å…¬é–‹å¯†ç¢¼åŒ™"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公開密碼匙..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "é »é“å¯†ç¢¼"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "é »é“å…¬é–‹å¯†ç¢¼åŒ™æ¸…å–®"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
 "signatures. If passphrase is set, it is required to be able to join. If "
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
-msgstr ""
-"é »é“èªè­‰æ˜¯ç”¨ä¾†é˜²æ­¢é »é“æœªç¶“æŽˆæ¬Šè€Œè¢«å­˜å–ï¼Œèªè­‰çš„æ–¹æ³•å¯ä»¥æ˜¯é€éŽå¯†ç¢¼æˆ–è€…é€éŽæ•¸ç¢¼"
-"ç°½ç½²ã€‚å¦‚æžœè¨­å®šäº†å¯†ç¢¼ï¼ŒåŠ å…¥é »é“å°±å¿…é ˆäº‹å…ˆè¼¸å…¥å¯†ç¢¼ï¼›å¦‚æžœè¨­å®šäº†é »é“å…¬é–‹å¯†ç¢¼åŒ™ï¼Œ"
-"åŠ å…¥é »é“å°±å¿…é ˆæ“æœ‰æ‰€åˆ—å…¬é–‹å¯†ç¢¼åŒ™å…§ä¹‹å…¶ä¸€ã€‚"
+msgstr "é »é“èªè­‰æ˜¯ç”¨ä¾†é˜²æ­¢é »é“æœªç¶“æŽˆæ¬Šè€Œè¢«å­˜å–ï¼Œèªè­‰çš„æ–¹æ³•å¯ä»¥æ˜¯é€éŽå¯†ç¢¼æˆ–è€…é€éŽæ•¸ç¢¼ç°½ç½²ã€‚å¦‚æžœè¨­å®šäº†å¯†ç¢¼ï¼ŒåŠ å…¥é »é“å°±å¿…é ˆäº‹å…ˆè¼¸å…¥å¯†ç¢¼ï¼›å¦‚æžœè¨­å®šäº†é »é“å…¬é–‹å¯†ç¢¼åŒ™ï¼ŒåŠ å…¥é »é“å°±å¿…é ˆæ“æœ‰æ‰€åˆ—å…¬é–‹å¯†ç¢¼åŒ™å…§ä¹‹å…¶ä¸€ã€‚"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11203,151 +11278,151 @@ msgstr "é »é“èªè­‰"
 msgid "Channel Authentication"
 msgstr "é »é“èªè­‰"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "新增／移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "è«‹ä½ çµ¦é »é“ %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "æ–°å¢žé »é“å°åœˆå­"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限；要清除使用者數目上限，輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/silc/chat.c:912
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "æ¸…é™¤æ°¸ä¹…æ€§é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "è¨­å®šæ°¸ä¹…æ€§é »é“æ¨¡å¼"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "æ¸…é™¤ç§ç”¨é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "è¨­å®šç§ç”¨é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "æ¸…é™¤ç§˜å¯†é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "è¨­å®šç§˜å¯†é »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "åŠ å…¥å°åœˆå­å‰ï¼Œä½ å¿…é ˆé¦–å…ˆåŠ å…¥é »é“ %s"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "åŠ å…¥å°åœˆå­"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "ç„¡æ³•åŠ å…¥å°åœˆå­"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "未知的指令"
 
-#  NOTE 這些都是視窗標題
+#  NOTE 這些都是視窗標題
 #: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
 #: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
 #: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
@@ -11377,9 +11452,8 @@ msgstr "檔案傳輸時發生錯誤"
 msgstr "檔案傳輸時發生錯誤"
 
 #: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s 結束連線"
+msgstr "é ç«¯çµæŸé€£ç·š"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -11390,12 +11464,10 @@ msgstr "交換密碼匙失敗"
 msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
 msgstr "連線已逾時"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
 msgstr "連線失敗"
 
@@ -11423,11 +11495,9 @@ msgstr "無法傳送檔案"
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-# TODO 要覆查 - 20061025
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "錯誤訊息"
+msgstr "出現了錯誤"
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11486,7 +11556,7 @@ msgstr "被 %s 從網絡上移除 (%s)"
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網絡上移除 (%s)"
 
-#  XXX è¦æ ¸å¯¦
+#  XXX 要核實
 #: ../libpurple/protocols/silc/ops.c:796
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
@@ -11508,7 +11578,7 @@ msgstr "職責"
 msgstr "職責"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11529,7 +11599,7 @@ msgstr "åŠ å…¥èŠå¤©å®¤"
 msgid "Join Chat"
 msgstr "åŠ å…¥èŠå¤©å®¤"
 
-#  XXX æš«è­¯
+#  XXX 暫譯
 #: ../libpurple/protocols/silc/ops.c:1127
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
@@ -11543,7 +11613,7 @@ msgstr "<I>%s</I> çš„é »é“å‰µç«‹è€…ç‚º 
 msgstr "<I>%s</I> çš„é »é“å‰µç«‹è€…ç‚º <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11555,91 +11625,91 @@ msgstr "狀態訊息"
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公開密碼匙指紋"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
+#  FIXME 看了原始碼也不知所云，所以大概會是譯錯 - acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
-msgstr "網絡統計資料"
+msgstr "這個網絡是空白的"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "沒有收到公開密碼匙"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11675,55 +11745,55 @@ msgstr ""
 "伺服器管理者總數：%d 人\n"
 "路由器管理者總數：%d 人\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "網絡統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "無法傱網絡上移除使用者"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#  XXX acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
-msgstr ""
+msgstr "WATCH"
 
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
-msgstr "ç„¡æ³•æ–°å¢žä½ è‡ªå·±è‡³å¥½å‹æ¸…å–®"
+msgstr "無法追蹤使用者"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "æ ¸å¯¦ä¼ºæœå™¨çš„å…¬é–‹å¯†ç¢¼åŒ™ä¸­"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "å¿…é ˆè¼¸å…¥å¯†ç¢¼"
@@ -11733,9 +11803,7 @@ msgid ""
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr ""
-"收到 %s çš„å…¬é–‹å¯†ç¢¼åŒ™ï¼Œä½†æ”¶åˆ°çš„å…¬é–‹å¯†ç¢¼åŒ™è·Ÿä½ ç¾æœ‰çš„ä¸åŒã€‚ä»ç„¶æŽ¥å—é€™å€‹å…¬é–‹å¯†ç¢¼"
-"匙嗎？"
+msgstr "收到 %s çš„å…¬é–‹å¯†ç¢¼åŒ™ï¼Œä½†æ”¶åˆ°çš„å…¬é–‹å¯†ç¢¼åŒ™è·Ÿä½ ç¾æœ‰çš„ä¸åŒã€‚ä»ç„¶æŽ¥å—é€™å€‹å…¬é–‹å¯†ç¢¼åŒ™å—Žï¼Ÿ"
 
 #: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
@@ -11769,86 +11837,83 @@ msgstr "不支援的公開密碼匙類åž
 msgid "Unsupported public key type"
 msgstr "不支援的公開密碼匙類型"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "密碼匙交換失敗"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗，請按「重新連線」建立新的連線。"
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙：%s"
+msgstr "無法讀取 SILC 配對密碼匙"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "è¨˜æ†¶é«”ä¸å¤ "
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
-msgstr "建立 SILC key pair 中..."
+msgstr "讀取 SILC 配對密碼匙途中出現錯誤"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "ä½ ç›®å‰çš„å¿ƒæƒ…"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "正常"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11857,100 +11922,98 @@ msgstr ""
 "\n"
 "聯絡方法"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "視像會議中"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "目前狀態"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/silc/silc.c:790
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "所用之網上服務"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "è®“ä»–äººå¯ä»¥å¾—çŸ¥ä½ ä½¿ç”¨é‚£äº›ç¶²ä¸Šæœå‹™"
 
-#  NOTE XXX 原始碼顯示這個其實不是電腦類型，而是操作系統版本 :-/
-#: ../libpurple/protocols/silc/silc.c:799
+#  NOTE XXX 原始碼顯示這個其實不是電腦類型，而是操作系統版本 :-/
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "å®¹è¨±åˆ¥äººæŸ¥çœ‹ä½ ç”¨çš„æ˜¯ä»€éº¼é›»è…¦"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "ä½ çš„ VCard 檔案"
 
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
+#  XXX 看了原始碼也不知所云，暫時只有直譯了事
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
-msgstr "時區"
+msgstr "時區 (UTC)"
 
-#  XXX 好像很怪
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#  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
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
-msgstr ""
-"ä½ å¯ä»¥çµ¦å…¶ä»–ä½¿ç”¨è€…çœ‹è¦‹ä½ çš„ä¸Šç·šç‹€æ…‹åŠå€‹äººè³‡æ–™ã€‚æœ‰é—œä½ çš„è³‡è¨Šï¼Œåªé ˆè¼¸å…¥ä½ å¸Œæœ›åˆ¥"
-"äººçœ‹å¾—è¦‹çš„å„é …ã€‚"
+msgstr "ä½ å¯ä»¥çµ¦å…¶ä»–ä½¿ç”¨è€…çœ‹è¦‹ä½ çš„ä¸Šç·šç‹€æ…‹åŠå€‹äººè³‡æ–™ã€‚æœ‰é—œä½ çš„è³‡è¨Šï¼Œåªé ˆè¼¸å…¥ä½ å¸Œæœ›åˆ¥äººçœ‹å¾—è¦‹çš„å„é …ã€‚"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11958,258 +12021,252 @@ msgstr "產生新的 SILC 密錀對"
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "配對密碼匙產生失敗"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "密碼匙長度"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公開密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "私人密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "產生配對密碼匙"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 配對密碼匙..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網絡上"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "å¿…é ˆæŒ‡å®šç¶²å"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s çš„é »é“æ¨¡å¼ç‚ºï¼š%s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s æ²’æœ‰è¨­å®šé »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s è¨­å®šé »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令：%s（可能是客戶端的錯誤）"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [é »é“]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [é »é“]：離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;é »é“&gt; [&lt;密碼&gt;]ï¼šåŠ å…¥ä¸€å€‹åœ¨ç¶²çµ¡ä¸Šçš„èŠå¤©å®¤"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list：列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;網名&gt;：查看這個網名的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;網名&gt; &lt;訊息&gt;：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;網名&gt; [&lt;訊息&gt;]：送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd：顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach：暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]：自伺服器離線，並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;：執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;網名&gt; [-pubkey|&lt;理由&gt;]：從網絡上移除網名"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新網名&gt;ï¼šæ”¹è®Šä½ çš„ç¶²å"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;網名&gt;：查看網名的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;é »é“&gt; [+|-&lt;模式&gt;]; [參數]ï¼šè¨­å®šæˆ–é¡¯ç¤ºé »é“æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
-msgstr ""
-"cumode &lt;é »é“&gt; +|-&lt;模式&gt; &lt;網名&gt;ï¼šåœ¨æŒ‡å®šé »é“ä¿®æ”¹æŒ‡å®šçš„ç¶²åçš„"
-"模式"
+msgstr "cumode &lt;é »é“&gt; +|-&lt;模式&gt; &lt;網名&gt;ï¼šåœ¨æŒ‡å®šé »é“ä¿®æ”¹æŒ‡å®šçš„ç¶²åçš„æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;ï¼šè¨­å®šä½ åœ¨ç¶²çµ¡ä¸Šçš„æ¨¡å¼"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;網名&gt; [-pubkey]：取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
-msgstr ""
-"invite &lt;é »é“&gt; [-|+]&lt;網名&gt;ï¼šé‚€è«‹æŒ‡å®šçš„ç¶²åã€æ–°å¢žæŒ‡å®šçš„ç¶²ååˆ°é »é“çš„"
-"è¢«é‚€è€…åˆ—è¡¨ã€æˆ–æŠŠæŒ‡å®šçš„ç¶²åå¾žé »é“çš„è¢«é‚€è€…åˆ—è¡¨ä¸­ç§»é™¤"
+msgstr "invite &lt;é »é“&gt; [-|+]&lt;網名&gt;ï¼šé‚€è«‹æŒ‡å®šçš„ç¶²åã€æ–°å¢žæŒ‡å®šçš„ç¶²ååˆ°é »é“çš„è¢«é‚€è€…åˆ—è¡¨ã€æˆ–æŠŠæŒ‡å®šçš„ç¶²åå¾žé »é“çš„è¢«é‚€è€…åˆ—è¡¨ä¸­ç§»é™¤"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;é »é“&gt; &lt;網名&gt; [備註]ï¼šæŠŠæŒ‡å®šçš„ç¶²åå¾žé »é“ä¸­è¸¢å‡º"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]：觀看伺服器的管理細節"
 
-#  XXX æš«è­¯
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;é »é“&gt; +|-&lt;網名&gt;]ï¼šæ–¼æŒ‡å®šçš„é »é“ç¦æ­¢æŒ‡å®šçš„ç”¨æˆ¶ç«¯"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;網名|伺服器&gt;：取得用戶端或伺服器的公開密碼匙"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats：觀看伺服器及網絡的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping：向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;é »é“&gt;ï¼šåˆ—å‡ºé »é“ä¸­çš„ä½¿ç”¨è€…"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;é »é“...&gt;：列出指定的一或"
-"å¤šå€‹é »é“çš„ä½¿ç”¨è€…æˆ–æŸä¸€é¡žä½¿ç”¨è€…"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;é »é“...&gt;ï¼šåˆ—å‡ºæŒ‡å®šçš„ä¸€æˆ–å¤šå€‹é »é“çš„ä½¿ç”¨è€…æˆ–æŸä¸€é¡žä½¿ç”¨è€…"
 
 #. *< type
 #. *< ui_requirement
@@ -12220,145 +12277,146 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性互聯網即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "網絡"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "公開密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "私人密碼匙檔案"
 
-# XXX æš«è­¯ - 20061025
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+# XXX 暫譯 - 20061025
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "åŠ å¯†æ–¹æ³•"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#  XXX 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  XXX 但其實譯文並不統一 - acli 20070614
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "使用完全向前保密 (PFS)"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "使用公開密碼匙認證"
 
-#  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#  XXX 好像聽來很怪
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密碼匙的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+# XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "數碼簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "建立 SILC key pair 中..."
+msgstr "產生 SILC 配對密碼匙中..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
-msgstr "建立 SILC key pair 中..."
+msgstr "無法產生 SILC 配對密碼匙\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名：　　　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱：\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "電子郵件：\t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱：　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構：　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家：　　　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法：　　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密碼匙長度：　\t%d 個位元\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/util.c:378
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "åŽŸå› ï¼š%s"
+msgstr "版本：　　　\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12370,7 +12428,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12380,51 +12438,51 @@ msgstr ""
 "公開密碼匙指紋可讀版本 (Babbleprint)：\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公開密碼匙資訊"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "電腦"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s å‚³é€è¨Šæ¯åˆ°ç™½æ¿ã€‚ä½ è¦é–‹å•Ÿç™½æ¿å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s 傳送訊息到 %s é »é“çš„ç™½æ¿ã€‚ä½ è¦é–‹å•Ÿç™½æ¿å—Žï¼Ÿ"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "白板"
 
@@ -12433,54 +12491,44 @@ msgstr "伺服器沒有統計資料"
 msgstr "伺服器沒有統計資料"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "å¤±æ•—ï¼šç‰ˆæœ¬ä¸ç¬¦ï¼Œè«‹æ›´æ–°ä½ çš„ç”¨æˆ¶ç«¯ç¨‹å¼"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸ä¿¡ä»»ï¼ä¸æ”¯æ´ä½ çš„å…¬é–‹å¯†ç¢¼åŒ™"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å¯†ç¢¼åŒ™äº¤æ›ç¾£çµ„ (KE group)"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„åŠ å¯†æ–¹å¼ (cipher)"
 
-#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„å…¬é–‹å¯†ç¢¼åŒ™è­‰æ›¸æ¨™æº– (PKCS)"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„é›œæ¹Šå‡½æ•¸ (hash function)"
 
-#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "å¤±æ•—ï¼šé ç«¯ä¸æ”¯æ´å»ºè­°ä¸­çš„èº«ä»½é©—è­‰ä»£ç¢¼ (HMAC)"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗：錯誤的簽署"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗：無效的 Cookie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗：認證失敗"
 
@@ -12488,7 +12536,7 @@ msgstr "無法初始化 SILC 的用戶ç«
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
-# NOTE é¦™æ¸¯æœƒå¯«ã€Œé™³å¤§æ–‡ã€ï¼Œå°ç£äººæœƒçœ‹ä¸æ˜Žï¼ˆå¯«ã€Œè€å¼µã€ä¸€é¡žï¼Œæ¸¯äººçœ‹è¦‹æœƒè¦ºå¾—å¾ˆæ€ªï¼‰ï¼Œé ­ç—› :P
+# NOTE 香港會寫「陳大文」，台灣人會看不明（寫「老張」一類，港人看見會覺得很怪），頭痛 :P
 #: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "無名氏"
@@ -12502,37 +12550,35 @@ msgstr "無法讀取 SILC 配對密碼åŒ
 msgid "Could not load SILC key pair: %s"
 msgstr "無法讀取 SILC 配對密碼匙：%s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "無法寫入"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "åŽŸå› ä¸æ˜Žã€‚"
+msgstr "不明的伺服器回應。"
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
 
@@ -12544,36 +12590,36 @@ msgstr "SIP 的帳號不可含有空白å
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "åˆŠç™»ç‹€æ…‹ï¼ˆè«‹æ³¨æ„ï¼šä»»ä½•äººéƒ½èƒ½çœ‹åˆ°ä½ ï¼‰"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -12612,14 +12658,13 @@ msgstr "%s 目前並未登入。"
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "è¨Šæ¯è¢«ä¸Ÿæ£„ï¼Œå› ç‚ºä½ é”åˆ°äº†ä¼ºæœå™¨æ‰€é™åˆ¶çš„ç™¼é€é€Ÿåº¦ã€‚"
 
@@ -12644,49 +12689,40 @@ msgstr "ä½ éºå¤±äº†ä¸€å€‹ç”± %s 送來ç
 msgstr "ä½ éºå¤±äº†ä¸€å€‹ç”± %s é€ä¾†çš„è¨Šæ¯ï¼Œå› ç‚ºå®ƒå‚³é€çš„é€Ÿåº¦å¤ªå¿«ã€‚"
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "禁止 E-Mail 檢查。"
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -12696,30 +12732,24 @@ msgstr "æœªçŸ¥çš„å¤±æ•—åŽŸå› ï¼š%s。"
 msgstr "æœªçŸ¥çš„å¤±æ•—åŽŸå› ï¼š%s。"
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "錯誤的帳號或密碼"
 
-#  NOTEã€Œæš«æ™‚ç„¡æ³•ä½¿ç”¨ã€æ‡‰è©²æ¯”ã€Œæš«æ™‚ä¸å­˜åœ¨ã€é€šé †
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "æš«æ™‚ç„¡æ³•ä½¿ç”¨è©²é …æœå‹™ã€‚"
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "ä½ ç›®å‰ç™»å…¥ç³»çµ±çš„è­¦å‘Šç­‰ç´šå¤ªé«˜ï¼Œä»¥è‡´ç„¡æ³•ç™»å…¥ã€‚"
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"ä½ çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç­‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœä½ ä¾ç„¶ç¹¼çºŒå˜—è©¦é€£ç·šï¼Œ"
-"é‚£éº¼ä½ çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
+msgstr "ä½ çš„é€£ç·šï¼æ–·ç·šå‹•ä½œå¤ªéŽé »ç¹ã€‚è«‹ç­‰å¾…ååˆ†é˜å¾Œå†è¡Œé‡è©¦ã€‚å¦‚æžœä½ ä¾ç„¶ç¹¼çºŒå˜—è©¦é€£ç·šï¼Œé‚£éº¼ä½ çš„ç­‰å¾…æ™‚é–“å°‡æœƒæ›´åŠ çš„å»¶é•·ã€‚"
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12751,8 +12781,8 @@ msgstr "密碼修改成功"
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
+#: ../pidgin/gtkblist.c:6599
 msgid "_Group:"
 msgstr "羣組(_G)："
 
@@ -12812,247 +12842,230 @@ msgstr "TOC 協定模組"
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
 
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "ç„¡æ³•é€å‡ºä½ çš„ Yahoo! 訊息。"
 
-# XXX æš«è­¯
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+# XXX 暫譯
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr ""
-"使用者 %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œå‰›å‰›æ‹’çµ•äº†ä½ å…ˆå‰å°‡ä»–ï¼ˆå¥¹ï¼‰æ–°å¢žè‡³ä½ çš„å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š%"
-"s"
+msgstr "使用者 %s å› ç‚ºä¸‹åˆ—åŽŸå› ï¼Œå‰›å‰›æ‹’çµ•äº†ä½ å…ˆå‰å°‡ä»–ï¼ˆå¥¹ï¼‰æ–°å¢žè‡³ä½ çš„å¥½å‹æ¸…å–®çš„è¦æ±‚ï¼š%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s å‰›å‰›æ‹’çµ•äº†ä½ å…ˆå‰å°‡ä»–ï¼ˆå¥¹ï¼‰æ–°å¢žè‡³ä½ çš„å¥½å‹æ¸…å–®çš„è¦æ±‚ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
-msgstr ""
-"Yahoo ä¼ºæœå™¨è¦æ±‚äº†ä½¿ç”¨ä¸€ç¨®ä¸æ˜Žçš„èªè­‰æ–¹å¼ï¼Œå› æ­¤å¾ˆå¯èƒ½ä¸æœƒæˆåŠŸç™»å…¥ Yahoo。請到 "
-"%s 檢查有沒有更新的版本。"
+msgstr "Yahoo ä¼ºæœå™¨è¦æ±‚äº†ä½¿ç”¨ä¸€ç¨®ä¸æ˜Žçš„èªè­‰æ–¹å¼ï¼Œå› æ­¤å¾ˆå¯èƒ½ä¸æœƒæˆåŠŸç™»å…¥ Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"ä½ å˜—è©¦å¿½ç•¥åœ¨ä½ çš„å¥½å‹åå–®å…§çš„ %sã€‚å¦‚æžœä½ æ‰“ç®—æŠŠä»–ï¼ˆå¥¹ï¼‰å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ï¼Œä¸¦"
-"隨即忽略他（她），請按一下「是」。"
+msgstr "ä½ å˜—è©¦å¿½ç•¥åœ¨ä½ çš„å¥½å‹åå–®å…§çš„ %sã€‚å¦‚æžœä½ æ‰“ç®—æŠŠä»–ï¼ˆå¥¹ï¼‰å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ï¼Œä¸¦éš¨å³å¿½ç•¥ä»–ï¼ˆå¥¹ï¼‰ï¼Œè«‹æŒ‰ä¸€ä¸‹ã€Œæ˜¯ã€ã€‚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "ä½ çš„å¸³æˆ¶ç›®å‰è¢«æš«æ™‚é—œé–‰ã€‚è«‹ä½ ç™»å…¥ Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
-# XXX æš«è­¯ - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+# XXX 暫譯 - 20061025
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
 #: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"與伺服器之間的連線突然中斷:\n"
+"與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"無法與伺服器建立連線:\n"
+"無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "走出去了"
 
-# NOTE marv (模組作者) 解說：「對，這是表示好友並不在伺服器上的清單中。
-# NOTE é€™ä¹Ÿè¡¨ç¤ºä½ ä¸æœƒçœ‹è¦‹é€™å€‹å¥½å‹ç™»å…¥ç­‰ç­‰ã€‚ã€(yeah, it mean the buddy
+# NOTE marv (模組作者) 解說：「對，這是表示好友並不在伺服器上的清單中。
+# 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:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "å ±ç¨±ä¸Šç·š"
 
-# NOTE Yahoo å®˜æ–¹è­¯ã€Œæ°¸é é¡¯ç¤ºé›¢ç·šã€ï¼Œèªªç™½ä¸€é»žå…¶å¯¦å³æ˜¯ï¼ˆé‡å°æŸäººï¼‰ã€Œé•·æœŸéš èº«ã€
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+# NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "é•·æœŸå ±ç¨±é›¢ç·š"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "上線狀態"
 
-# NOTE ä¸‹æ¬¡ç™»å…¥æ™‚ä¸å ±ç¨±é›¢ç·šï¼Œæ‰€ä»¥åŠ ã€Œæš«æ™‚ã€å­—çœ¼
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+# NOTE 下次登入時不報稱離線，所以加「暫時」字眼
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "æš«æ™‚å ±ç¨±é›¢ç·š"
 
-#  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#  NOTE 這是清單內的一個指令
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "åœæ­¢é•·æœŸå ±ç¨±é›¢ç·š"
 
-# NOTE #gaim çš„ Vann 及 LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
-# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
-msgstr "啟動哪一個 ID？"
+msgstr "啟用哪一個 ID？"
 
-# NOTE #gaim çš„ Vann 及 LSchiere è§£ï¼šå¦‚æžœé¸å–äº†çš„å¥½å‹ç›®å‰è™•æ–¼ä¸€å€‹èŠå¤©ï¼Œä¾¿åŠ å…¥è©²å€‹èŠå¤©
-# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr "åŠ å…¥å“ªå€‹å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤ï¼Ÿ"
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
+msgstr "åŠ å…¥èª°çš„èŠå¤©å®¤ï¼Ÿ"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "å•Ÿå‹• ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "åŠ å…¥å¥½å‹ç›®å‰æ‰€åœ¨çš„èŠå¤©å®¤..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
-msgstr "開啟Hotmail收件匣"
+msgstr "開啟收件匣"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;ï¼šåŠ å…¥ä½æ–¼ Yahoo! 網絡的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網絡上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -13066,57 +13079,57 @@ msgstr "doodle: 要求使用者開始 Do
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "å‚³å‘¼ç³»çµ±é€šè¨ŠåŸ "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "æª”æ¡ˆå‚³è¼¸é€šè¨ŠåŸ "
 
-#  XXX ç„¡åŠƒä¸€è­¯æ³•ï¼Œæœ‰è­¯ã€Œåœ°å€ã€ã€ã€Œå€åŸŸã€ç”šè‡³ã€Œå ´æ‰€ã€(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Yahoo èŠå¤©å®¤é€šè¨ŠåŸ "
 
@@ -13127,14 +13140,13 @@ msgstr "送出 Doodle 要求。"
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
-# TODO - 覆查譯文 - 20061028
+# TODO - 覆查譯文 - 20061028
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "寫入錯誤"
@@ -13153,7 +13165,7 @@ msgstr "對不起，暫時並不支援å…
 "time."
 msgstr "對不起，暫時並不支援內容被列為兒童不宜的個人資料。"
 
-# NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」
+# NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -13195,7 +13207,7 @@ msgstr "更新日期"
 msgid "Last Update"
 msgstr "更新日期"
 
-# NOTE 譯文更動 by Ambrose
+# NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
@@ -13211,17 +13223,14 @@ msgid ""
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
-msgstr ""
-"無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。"
+msgstr "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
-msgstr ""
-"無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! 會不"
-"æ™‚æ‰¾ä¸åˆ°ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚è‹¥æžœä½ çŸ¥é“ä½¿ç”¨è€…ç¢ºå¯¦å­˜åœ¨ï¼Œè«‹ç¨å¾Œé‡è©¦ã€‚"
+msgstr "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! æœƒä¸æ™‚æ‰¾ä¸åˆ°ä½¿ç”¨è€…çš„å€‹äººè³‡æ–™ã€‚è‹¥æžœä½ çŸ¥é“ä½¿ç”¨è€…ç¢ºå¯¦å­˜åœ¨ï¼Œè«‹ç¨å¾Œé‡è©¦ã€‚"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13279,12 +13288,12 @@ msgstr "讀取聊天室清單發生錯èª
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
-# NOTE 解「可語音聊天的使用者數目」(marv)
+# NOTE 解「可語音聊天的使用者數目」(marv)
 #: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "可語音聊天"
 
-# NOTE 解「可視像聊天的使用者數目」(marv)
+# NOTE 解「可視像聊天的使用者數目」(marv)
 #: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "可視像聊天"
@@ -13301,11 +13310,11 @@ msgstr "使用者建立之聊天室"
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13341,20 +13350,20 @@ msgstr "任何人"
 msgid "Anyone"
 msgstr "任何人"
 
-# XXX æš«è­¯
-# NOTE 之前的搜尋結果（下列第一個鏈結）是說 Class 不是類別，
-# NOTE 但另有說明（下列第二個鏈結）的實例似乎顯示 Class 基本上可以說是類別
-# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
-# NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
+# XXX 暫譯
+# NOTE 之前的搜尋結果（下列第一個鏈結）是說 Class 不是類別，
+# NOTE 但另有說明（下列第二個鏈結）的實例似乎顯示 Class 基本上可以說是類別
+# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
+# 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
 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
+# 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
 msgid "_Instance:"
 msgstr "å¯¦é«”ï¼é »é“(_I)："
@@ -13363,7 +13372,7 @@ msgstr "接受者(_R)："
 msgid "_Recipient:"
 msgstr "接受者(_R)："
 
-#  FIXME æš«è­¯
+#  FIXME 暫譯
 #: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
@@ -13403,24 +13412,19 @@ msgid ""
 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;"
+msgstr "zi &lt;類別&gt; &lt;實體&gt：送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;<i>類別</i>,<i>"
-"實體</i>,<i>接受者</i>&gt;"
+msgstr "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;<i>類別</i>,<i>實體</i>,<i>接受者</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
-"</i>&gt;"
+msgstr "zir &lt;實體&gt; &lt;接受者&gt;：送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -13432,7 +13436,7 @@ msgstr "é‡æ–°åŠ å…¥æ‰€æœ‰èŠå¤©å®¤"
 msgid "Resubscribe"
 msgstr "é‡æ–°åŠ å…¥æ‰€æœ‰èŠå¤©å®¤"
 
-#  FIXME 要覆查譯文
+#  FIXME 要覆查譯文
 #: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
@@ -13460,7 +13464,7 @@ msgstr "TZC 指令"
 msgid "tzc command"
 msgstr "TZC 指令"
 
-# NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
+# NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
@@ -13474,7 +13478,7 @@ msgstr "匯出至 .zephyr.subs 檔"
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
-# NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
+# NOTE: 這是Zephyr使用者會自然明白的術語，不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
@@ -13492,15 +13496,15 @@ msgstr "域名"
 msgid "Realm"
 msgstr "域名"
 
-# FIXME 暫譯；譯得很差，有待改進
-# NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
+# FIXME 暫譯；譯得很差，有待改進
+# NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
 #: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13509,46 +13513,60 @@ msgstr ""
 "無法建立 Socket：\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "無法解析 HTTP 代理伺服應的回應：%s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "拒絕存取：HTTP ä»£ç†ä¼ºæœå™¨ç¦æ­¢é€šè¨ŠåŸ  %d 的資料傳送。"
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 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
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -13559,7 +13577,7 @@ msgstr "我現在不在位子上"
 msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
-# FIXME 這很明顯是誤譯，但想不到怎樣寫才對 - 20061025
+# FIXME 這很明顯是誤譯，但想不到怎樣寫才對 - 20061025
 #: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "儲存狀態"
@@ -13572,14 +13590,14 @@ msgid "Requesting %s's attention..."
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "要求 %s 的注意中..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
+msgstr "%s è¦æ±‚ä½ æ³¨æ„ï¼"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13588,23 +13606,22 @@ msgstr ""
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
 # FIXME ambiguous - 20061025
-# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-# XXX çœŸæ­£çš„æ„æ€æ˜¯ã€Œç„¡æ³•é€£ç·šè‡³èªè­‰æ‰€éœ€çš„é ç«¯è³‡æºã€ï¼Œä¸æ˜¯ã€Œé€£ç·šå¤±æ•—ã€ï¼ˆè¦‹ä¸Šåˆ—æ–‡ç« ï¼‰
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "ç„¡æ³•é€£ç·šè‡³èªè­‰æ‰€éœ€çš„é ç«¯è³‡æº"
+msgstr "SSL 連線失敗"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13612,24 +13629,22 @@ msgid "SSL peer presented an invalid cer
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL peer 出示了無效的證書"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "未知錯誤"
+msgstr "未知的 SSL 錯誤"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
 #: ../libpurple/status.c:159
-#, fuzzy
 msgid "Extended away"
 msgstr "長時間離開"
 
@@ -13637,138 +13652,156 @@ msgstr "使用流動通訊器材"
 msgid "Mobile"
 msgstr "使用流動通訊器材"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "聽音樂中"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:613
 #, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) 從「%s」狀態改變為「%s」"
+
+#: ../libpurple/status.c:624
+#, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:626
 #, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) 目前為%s"
+
+#: ../libpurple/status.c:632
+#, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
 #, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) 不再%s"
+
+#: ../libpurple/status.c:1247
+#, c-format
 msgid "%s became idle"
 msgstr "%s 更改狀態為閒置"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 更改狀態為閒置"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2723
+# NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr ""
-"åœ¨è§£æžä½ çš„%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
+msgstr "åœ¨è§£æžä½ çš„%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d æ—¥"
 msgstr[1] "%d æ—¥"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
+msgstr "無法打開 %s：重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%sã€å–å¾—è¶³å¤ çš„è¨˜æ†¶é«”ï¼Œç¶²ç«™çš„ä¼ºæœå™¨å¯èƒ½æ‡·æœ‰æƒ¡æ„ã€‚"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -13785,91 +13818,85 @@ msgstr "透過多種通訊協定發送å
 msgid "Send instant messages over multiple protocols"
 msgstr "透過多種通訊協定發送即時訊息"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "方向"
 
 #  NOTE: stolen from eggcups' zh_TW.po
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "ç™»å…¥é¸é …"
 
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
-msgstr "通訊協定："
+msgstr "通訊協定(_T)："
 
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
-msgstr "帳號："
+msgstr "帳號(_N)："
 
-# NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
+# NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
-msgstr "帳號別名（只在本機生效）："
+msgstr "帳號別名（只在本機生效）(_L)："
 
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
-msgstr "記住密碼"
+msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "ä½¿ç”¨è€…è‡ªå®šé¸é …"
 
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
-msgstr "新郵件通知"
+msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-#, fuzzy
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
-msgstr "使用下列好友圖示："
+msgstr "使用下列好友圖示(_I)："
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "%s é¸é …"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
-# NOTE å¯ä»¥æœ‰ä»£ç†ä¼ºæœå™¨ä½†æ¯‹é ˆç”¨
-# NOTE é¦™æ¸¯æ™®éç”¨ã€Œæ¯‹é ˆã€ï¼Œä½†è¬›åœ‹èªžã€Œæ¯‹é ˆã€æœƒä¸é€šé †ï¼Œã€Œä¸ä½¿ç”¨ã€è¼ƒå¥½
-#: ../pidgin/gtkaccount.c:943
+# NOTE 可以有代理伺服器但毋須用
+# NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -13878,73 +13905,72 @@ msgstr "使用環境變數設定"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "å¦‚æžœä½ çœ‹å¾—å¤ ä»”ç´°"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "ä»£ç†ä¼ºæœå™¨é¸é …"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "é€šè¨ŠåŸ (_P)："
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "無法建立連結"
+msgstr "無法儲存新帳號"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "已有一個乎合指定條件的帳號。"
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
-msgstr ""
+msgstr "在伺服器上建立這個新帳號"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "å•Ÿå‹•"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13959,260 +13985,279 @@ msgstr ""
 msgstr ""
 "<span size='larger' weight='bold'>歡迎使用 %s!</span>\n"
 "\n"
-"ä½ å°šæœªè¨­å®šä»»ä½•å³æ™‚é€šè¨Šçš„å¸³è™Ÿã€‚è¦ä½¿ç”¨ %s ä¾†é€šè¨Šï¼Œè«‹å…ˆæŒ‰ä¸‹é¢çš„ã€ŒåŠ å…¥ã€æŒ‰ç´ï¼Œå†"
-"è¨­å®šå¥½ä½ çš„å¸³è™Ÿå³å¯ã€‚å¦‚æžœä½ å¸Œæœ› %s 使用多個即時通訊帳號，可在完成上一步後，繼"
-"çºŒæŒ‰ã€ŒåŠ å…¥ã€æŒ‰ç´ä¾†è¨­å®šå…¶ä»–çš„å¸³è™Ÿã€‚\n"
+"ä½ å°šæœªè¨­å®šä»»ä½•å³æ™‚é€šè¨Šçš„å¸³è™Ÿã€‚è¦ä½¿ç”¨ %s ä¾†é€šè¨Šï¼Œè«‹å…ˆæŒ‰ä¸‹é¢çš„ã€ŒåŠ å…¥ã€æŒ‰ç´ï¼Œå†è¨­å®šå¥½ä½ çš„å¸³è™Ÿå³å¯ã€‚å¦‚æžœä½ å¸Œæœ› %s ä½¿ç”¨å¤šå€‹å³æ™‚é€šè¨Šå¸³è™Ÿï¼Œå¯åœ¨å®Œæˆä¸Šä¸€æ­¥å¾Œï¼Œç¹¼çºŒæŒ‰ã€ŒåŠ å…¥ã€æŒ‰ç´ä¾†è¨­å®šå…¶ä»–çš„å¸³è™Ÿã€‚\n"
 "\n"
-"ä½ å¦‚æžœå¸Œæœ›æ–°å¢žã€ä¿®æ”¹æˆ–åˆªé™¤å¸³è™Ÿï¼Œåªè¦é€éŽå¥½å‹æ¸…å–®ä¸Šçš„ã€Œå¸³è™Ÿ->新增／編輯」指"
-"令，即可返回這個畫面。"
+"ä½ å¦‚æžœå¸Œæœ›æ–°å¢žã€ä¿®æ”¹æˆ–åˆªé™¤å¸³è™Ÿï¼Œåªè¦é€éŽå¥½å‹æ¸…å–®ä¸Šçš„ã€Œå¸³è™Ÿ->新增／編輯」指令，即可返回這個畫面。"
 
-# TODO çœ‹èµ·ä¾†æ‡‰è©²ç‚ºåŠ ä¸€å€‹æ–°çš„èŠå¤©å®¤ï¼Œä¸¦æŠŠèŠå¤©å®¤æ­¸é¡žåˆ°æŸå€‹ç¾¤çµ„ã€‚
-# NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "åŠ å…¥èŠå¤©å®¤"
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "ä½ ç›®å‰æœ‰ %d 個稱為「%sã€çš„å¥½å‹ï¼Œä½ è¦æŠŠé€™å€‹å¥½å‹åˆä½µå—Žï¼Ÿ"
+msgstr[1] "ä½ ç›®å‰æœ‰ %d 個稱為「%sã€çš„å¥½å‹ï¼Œä½ è¦æŠŠé€™äº›å¥½å‹åˆä½µå—Žï¼Ÿ"
 
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:544
 msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr "åˆä½µå¾Œï¼Œé€™äº›å¥½å‹åœ¨å¥½å‹æ¸…å–®å°‡åªå‡ºç¾ä¸€æ¬¡ï¼Œé€šè¨Šæ™‚ä¹Ÿæœƒå…±ç”¨ä¸€å€‹äº¤è«‡è¦–çª—ã€‚å¦‚æžœå¸Œæœ›æŠŠé€™äº›å¥½å‹å†æ¬¡åˆ†é–‹ï¼Œåœ¨å¥½å‹æ¸…å–®ä¸­ä»¥æ»‘é¼ å³éµé»žæ“Šå¥½å‹åç¨±ï¼Œå†é¸æ“‡ã€Œå±•é–‹ã€å³å¯ã€‚"
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: ../pidgin/gtkblist.c:961
+msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "è«‹è¼¸å…¥é—œæ–¼ä½ æ‰€æƒ³åŠ å…¥å¥½å‹æ¸…å–®çš„èŠå¤©å®¤çš„é©ç•¶è³‡è¨Šã€‚\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr "移至"
+
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "傳送檔案"
+#: ../pidgin/gtkblist.c:1353
+msgid "_Send File..."
+msgstr "傳送檔案(_S)..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰(_P)"
+#: ../pidgin/gtkblist.c:1360
+msgid "Add Buddy _Pounce..."
+msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰(_P)..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr "離線時隱藏"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr "離線時顯示"
+
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "新增一個好友(_B)"
+#: ../pidgin/gtkblist.c:1450
+msgid "Add _Buddy..."
+msgstr "新增好友(_B)..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "新增一個聊天室(_H)"
+#: ../pidgin/gtkblist.c:1453
+msgid "Add C_hat..."
+msgstr "新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "刪除羣組(_D)"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "åŠ å…¥(_J)"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "è‡ªå‹•åŠ å…¥"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+# 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
+msgid "Persistent"
+msgstr "保持連線"
+
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
-# XXX æš«è­¯
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+# XXX 暫譯
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "ä½ ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›ä½ æ–°å¢žå“ªå€‹å¥½å‹çš„é€šè¨Šå”å®šã€‚"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/åŠ å…¥èŠå¤©å®¤(_C)"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
-#  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2873
+#  NOTE 此處譯「讀取」似乎較「取得」好一點
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/好友(_B)"
+#: ../pidgin/gtkblist.c:3109
+msgid "/Buddies/Sh_ow"
+msgstr "/好友/顯示(_O)"
 
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/好友/顯示離線好友(_O)"
+msgstr "/好友/顯示/離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/好友/顯示空白的羣組(_E)"
+msgstr "/好友/顯示/空白羣組(_E)"
 
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/好友/顯示好友細節(_D)"
+msgstr "/好友/顯示/好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/好友/顯示閒置時間(_T)"
+msgstr "/好友/顯示/閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/好友/顯示空白的羣組(_E)"
+msgstr "/好友/顯示/通訊協定圖示(_P)"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增羣組(_G)..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/帳號(_A)/新增\\/編輯"
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
+msgid "/Accounts/Manage"
+msgstr "/帳號/管理"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
-msgstr "/工具/偏好設定(_E)"
+msgstr "/工具/證書(_C)"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
-msgstr "說明(_H)"
+msgstr "/說明(_H)"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
-msgstr "網上說明(_H)"
+msgstr "/說明/網上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14221,727 +14266,719 @@ msgstr ""
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "上次登入"
 
-# XXX
-#: ../pidgin/gtkblist.c:3116
+# XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "é ‚å‘±å‘±"
 
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:3693
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "閒置 %d 小時 %02d 分"
+msgstr "閒置 %d 日 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/åŠ å…¥èŠå¤©å®¤(_C)..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增羣組..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/工具/私隱設定"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "æ ¹æ“šå­—æ¯"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
-msgstr "æ ¹æ“šç‹€æ…‹"
+msgstr "æ ¹æ“šç…§ç‹€æ…‹"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
-msgstr "æ ¹æ“šæ—¥èªŒå¤§å°"
+msgstr "æ ¹æ“šç…§æ—¥èªŒå¤§å°"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4483
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4067
+#: ../pidgin/gtkblist.c:4485
 #, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s 結束連線：%s</span>"
+msgid "%s disabled"
+msgstr "%s 已被停用"
 
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4489
+msgid "Reconnect"
+msgstr "重新連線"
+
+#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+msgid "Re-enable"
+msgstr "重新啟動"
+
+#  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
+#  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
+#: ../pidgin/gtkblist.c:4493 ../pidgin/gtkblist.c:4580
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../pidgin/gtkblist.c:4604
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºä½ ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
+msgstr[1] "%då€‹å¸³å·²è¢«åœç”¨ï¼Œå› ç‚ºä½ ç”±å…¶ä»–çš„åœ°æ–¹ç™»å…¥ã€‚"
+
+#: ../pidgin/gtkblist.c:4831
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4838
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4849
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4934
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4948
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
-"ä½ æœªæœ‰å•Ÿå‹•ä»»ä½•å¸³è™Ÿï¼Œè«‹é€éŽå¥½å‹æ¸…å–®ä¸Šçš„ã€Œå¸³è™Ÿ->新增」指令，到「帳號清單」啟動"
-"å¸³è™Ÿã€‚å¸³è™Ÿä¸€ç¶“å•Ÿå‹•ï¼Œå°±éš¨æ™‚å¯ä»¥ç™»å…¥æˆ–æ›´æ”¹ç‹€æ…‹ï¼›é€™æ¨£ï¼Œä½ å°±å¯ä»¥è·Ÿä½ çš„å¥½å‹é€šè¨Š"
-"了！"
+"ä½ æœªæœ‰å•Ÿå‹•ä»»ä½•å¸³è™Ÿï¼Œè«‹é€éŽå¥½å‹æ¸…å–®ä¸Šçš„ã€Œå¸³è™Ÿ->ç®¡ç†ã€æŒ‡ä»¤ï¼Œåˆ°ã€Œå¸³è™Ÿæ¸…å–®ã€å•Ÿå‹•å¸³è™Ÿã€‚å¸³è™Ÿä¸€ç¶“å•Ÿå‹•ï¼Œå°±éš¨æ™‚å¯ä»¥ç™»å…¥æˆ–æ›´æ”¹ç‹€æ…‹ï¼›é€™æ¨£ï¼Œä½ å°±å¯ä»¥è·Ÿä½ çš„å¥½å‹é€šè¨Šäº†ï¼"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:5219
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/好友/顯示離線好友"
+msgstr "/好友/顯示/離線好友"
 
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+#: ../pidgin/gtkblist.c:5222
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/好友/顯示空的好的羣組"
+msgstr "/好友/顯示/空羣組"
 
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+#: ../pidgin/gtkblist.c:5228
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/好友/顯示好友細節"
+msgstr "/好友/顯示/好友細節"
 
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+#: ../pidgin/gtkblist.c:5231
 msgid "/Buddies/Show/Idle Times"
-msgstr "/好友/顯示閒置時間"
+msgstr "/好友/顯示/閒置時間"
 
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+#: ../pidgin/gtkblist.c:5234
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/好友/顯示空的好的羣組"
+msgstr "/好友/顯示/通訊協定圖示"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:6166
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦åŠ å…¥å¥½å‹çš„å¸³è™Ÿã€‚ä½ å¯ä»¥ç‚ºé€™å€‹å¥½å‹è¨­å®šåˆ¥åæˆ–ç¶²åï¼Œè€Œé€™å€‹è¨­å®šå°‡æœƒ"
-"在好友清單中顯示。\n"
+msgstr "è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦åŠ å…¥å¥½å‹çš„å¸³è™Ÿã€‚ä½ å¯ä»¥ç‚ºé€™å€‹å¥½å‹è¨­å®šåˆ¥åæˆ–ç¶²åï¼Œè€Œé€™å€‹è¨­å®šå°‡æœƒåœ¨å¥½å‹æ¸…å–®ä¸­é¡¯ç¤ºã€‚\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6189
+msgid "A_ccount:"
+msgstr "帳號(_C)："
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
+#: ../pidgin/gtkblist.c:6201
 msgid "_Screen name:"
-msgstr "帳號："
+msgstr "帳號(_S)："
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
+#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
 msgid "A_lias:"
-msgstr "別名："
+msgstr "別名(_L)："
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6491
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6507
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "ä½ ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›ä½ åŠ å…¥èŠå¤©å®¤çš„é€šè¨Šå”å®šã€‚"
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6550
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "è«‹è¼¸å…¥åˆ¥åï¼Œæˆ–è€…é—œæ–¼ä½ æ‰€æƒ³åŠ å…¥å¥½å‹æ¸…å–®çš„èŠå¤©å®¤çš„é©ç•¶è³‡è¨Šã€‚\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6609
+msgid "Autojoin when account becomes online."
+msgstr "å¸³è™Ÿä¸Šç·šå¾Œéš¨å³è‡ªå‹•åŠ å…¥ã€‚"
+
+#: ../pidgin/gtkblist.c:6610
+msgid "Hide chat when the window is closed."
+msgstr "關閉視窗時只將聊天隱藏。"
+
+#: ../pidgin/gtkblist.c:6636
 msgid "Please enter the name of the group to be added."
 msgstr "è«‹çµ¦ä½ æ–°å¢žçš„ç¾£çµ„è¼¸å…¥åç¨±ã€‚"
 
 # XXX
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7282
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7306
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
-#  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
-#  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
+#  NOTE 譯成「不允許」會非常怪
+#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "沒有相關指令"
 
-# #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6654
+# #NOTE 和下一個「Enable Account」對應。
+#: ../pidgin/gtkblist.c:7327
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7339
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7345
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7394
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7464
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
-msgstr "伺服器"
+msgstr "SSL 伺服器"
 
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"åœ¨ä½ æ›´æ­£é€™å€‹éŒ¯èª¤ä¸¦é‡æ–°å•Ÿå‹•é€™å€‹å¸³è™Ÿå‰ï¼Œ%s 將不會再嘗試重新連線。"
-
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
-# XXX æš«è­¯
-#: ../pidgin/gtkconv.c:774
+# XXX 暫譯
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "ä½ ä¸¦æœªç™»å…¥ä»»ä½•ä¸€å€‹å¯ä¾›ä½ é‚€è«‹å“ªå€‹å¥½å‹çš„é€šè¨Šå”å®šã€‚"
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "è«‹è¼¸å…¥ä½ æƒ³é‚€è«‹çš„ä½¿ç”¨è€…åç¨±ï¼Œä»¥åŠé‚€è«‹çš„è¨Šæ¯ã€‚"
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "無法開啟檔案。"
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
-#  NOTE ä¹ƒã€Œå¿½ç•¥æ ¼å¼ã€çš„æ„æ€ï¼Œæ•…åªèƒ½è­¯æˆã€Œå¿½ç•¥ã€
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "å‹•ç•«"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2717
+#  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "全部顯示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2920
-#, fuzzy
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/交談/邀請..."
+msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2922
-#, fuzzy
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/交談/邀請..."
+msgstr "/交談/插入圖像(_E)..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/é¸é …(_O)"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/é¸é …/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/é¸é …/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/é¸é …/é¡¯ç¤ºæ ¼å¼å·¥å…·åˆ—(_T)"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/é¸é …/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
-msgstr "/é¸é …(_O)"
+msgstr "/é¸é …"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3240
-#, fuzzy
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
-msgstr "/交談/邀請..."
+msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3244
-#, fuzzy
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
-msgstr "/交談/邀請..."
+msgstr "/交談/插入圖像..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/é¸é …/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/é¸é …/開啟音效"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/é¸é …/é¡¯ç¤ºæ ¼å¼å·¥å…·åˆ—"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/é¸é …/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "傳送到(_S)"
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "傳送到(_E)"
 
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "網名被提及"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear：清空交談的回捲緩衝區"
+msgstr "clear：清空所有交談的回捲緩衝區"
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "ä½ é‚„æœ‰æœªè®€å–çš„è¨Šæ¯ã€‚ä½ ç¢ºå®šè¦é—œé–‰é€™å€‹è¦–çª—å—Žï¼Ÿ"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "é—œé–‰å…¶ä»–åˆ†é "
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "é—œé–‰æ‰€æœ‰åˆ†é "
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "åˆ†é›¢é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "é—œé–‰é€™å€‹åˆ†é "
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "æ ¹æ“šç¾£çµ„"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "æ ¹æ“šå¸³è™Ÿ"
 
-#  NOTEã€Œé™¤éŒ¯æ—¥èªŒã€å¾ˆæ€ªï¼Œã€Œé™¤éŒ¯ç´€éŒ„ã€è¼ƒé †å£ï¼Œè€Œä¸”å·²ç¶“æœ‰äººç”¨
-#: ../pidgin/gtkdebug.c:234
+#  NOTE「除錯日誌」很怪，「除錯紀錄」較順口，而且已經有人用
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
-# NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:582
+# NOTE 可能是指「反向選取」
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "反向"
 
-# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:585
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
-#  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
-#: ../pidgin/gtkdebug.c:652
+#  NOTE 除錯視窗的工具列的快取選單的指令，指「工具列的按紐以圖示標示」，下二同
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "æŒ‰å³éµä»¥é¡¯ç¤ºæ›´å¤šé¸é …ã€‚"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:824
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:833
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "全部訊息"
 
-# NOTE 這個不是指「Infoã€ï¼ˆå› ç‚ºå·²ç¶“æœ‰ã€ŒInfoã€ä¸€é …ï¼‰ï¼Œè€Œæ˜¯ä¸€ç¨®æ¯”ã€ŒInfo」還要低層次的除錯訊息，應是指「Debug」
-#: ../pidgin/gtkdebug.c:834
+# NOTE 這個不是指「Info」（因為已經有「Info」一項），而是一種比「Info」還要低層次的除錯訊息，應是指「Debug」
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "閒雜訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:836
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "警告訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:837
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "錯誤訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:838
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -14956,26 +14993,26 @@ msgstr "主要開發者"
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "開發者"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "資深貢獻者兼品管"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -15002,7 +15039,7 @@ msgstr "原作者"
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -15011,9 +15048,10 @@ msgstr "阿拉伯文"
 msgid "Arabic"
 msgstr "阿拉伯文"
 
+#  NOTE「Latin」係指譯文以「拉丁字母」（而非西里爾字母）書寫，中譯可以省略 - acli 20070918
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "白俄羅斯文"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
@@ -15025,19 +15063,19 @@ msgstr "å­ŸåŠ æ‹‰æ–‡"
 msgid "Bengali"
 msgstr "å­ŸåŠ æ‹‰æ–‡"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
-# NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "波希尼亞文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
+#  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
 msgid "Catalan"
 msgstr "åŠ æ³°éš†æ–‡"
 
-# NOTE ç›´è­¯æ˜¯ã€Œç“¦å€«è¥¿äºžå¼åŠ æ³°éš†æ–‡ã€ï¼Œä½†æ­£å¸¸çš„å«æ³•æ˜¯ç›´æŽ¥å¯«ã€Œç“¦å€«è¥¿äºžèªžã€(Valencian)
+# NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
 #: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
@@ -15055,8 +15093,8 @@ msgstr "å¾·æ–‡"
 msgid "German"
 msgstr "å¾·æ–‡"
 
-# NOTE 國名是「不丹」，中譯文依國名不依語文名
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
+# 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
 msgid "Dzongkha"
@@ -15078,7 +15116,7 @@ msgstr "英式英文"
 msgid "British English"
 msgstr "英式英文"
 
-#  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
+#  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
 #: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "世界語"
@@ -15089,12 +15127,9 @@ msgstr "西班牙文"
 msgid "Spanish"
 msgstr "西班牙文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
-# NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "波希尼亞文"
+msgstr "愛沙尼亞文"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
@@ -15116,13 +15151,13 @@ msgstr "法文"
 msgid "French"
 msgstr "法文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
+#  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
 msgid "Galician"
 msgstr "åŠ é‡Œè¥¿äºžæ–‡"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
 #: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "古吉拉特文"
@@ -15135,7 +15170,7 @@ msgstr "希伯來文"
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 #: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "印度文"
@@ -15148,11 +15183,11 @@ msgstr "印尼文"
 msgid "Indonesian"
 msgstr "印尼文"
 
-#  NOTE 港譯「意大利」，臺譯「義大利」。「意」為陰去聲，「義」為陽去聲；
-#  NOTE åœ‹èªžåŽ»è²ä¸åˆ†é™°é™½ï¼Œå»£æ±è©±å…©è²å»ç›¸å·®ç”šé ã€‚è‡ºç£æœ‰ç¶²ç«™å¯«ã€Œæ„å¤§åˆ©ã€ï¼Œ
-#  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
-#  NOTE【參見「Slovenian」】
-#  NOTE è¨»ï¼šå›  zh_TW å’Œ zh_HK 正式分家，還原成台式譯法「義大利」
+#  NOTE 港譯「意大利」，臺譯「義大利」。「意」為陰去聲，「義」為陽去聲；
+#  NOTE 國語去聲不分陰陽，廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」，
+#  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
+#  NOTE【參見「Slovenian」】
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」
 #: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "意大利文"
@@ -15166,13 +15201,13 @@ msgstr "æ ¼é­¯å‰äºžæ–‡"
 msgid "Georgian"
 msgstr "æ ¼é­¯å‰äºžæ–‡"
 
-# FIXME 可以譯好一點 20070520 acli
+# FIXME 可以譯好一點 20070520 acli
 #: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu æ——ä¸‹æ‰€æœ‰æ ¼é­¯å‰äºžæ–‡ç¿»è­¯äººå“¡"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
-# NOTE 註：KDE 譯「坎納達」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註：KDE 譯「坎納達」
 #: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "康納達文"
@@ -15186,34 +15221,33 @@ msgstr "韓文"
 msgid "Korean"
 msgstr "韓文"
 
-#  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
-#  NOTE è¨»ï¼šå›  zh_TW å’Œ zh_HK 正式分家，保留台式譯法「庫德」
+#  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
+#  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
 #: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "庫德文"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "獅子座"
+msgstr "寮國文"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#  NOTEã€Œé¦¬å…¶é “æ–‡ã€æ˜¯ä¸€ç¨®æ±æ­èªžæ–‡ï¼Œè·Ÿå¸Œè‡˜çš„é¦¬å…¶é “ä¸¦ç„¡é—œä¿‚
+#  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
 #: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "é¦¬å…¶é “æ–‡"
 
-#  NOTE 譯文不統一，一般似乎偏向音譯，但譯音也不統一
-#  NOTE 音譯包括：博克馬爾、波克默爾、布克莫爾、巴克摩
-#  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
-#  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
-#  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
+#  NOTE 譯文不統一，一般似乎偏向音譯，但譯音也不統一
+#  NOTE 音譯包括：博克馬爾、波克默爾、布克莫爾、巴克摩
+#  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
 msgid "Bokmål Norwegian"
@@ -15223,15 +15257,13 @@ msgstr "尼泊爾文"
 msgid "Nepali"
 msgstr "尼泊爾文"
 
-# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-# XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
+# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
+# XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
 #: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#  NOTE 這是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
 #: ../pidgin/gtkdialogs.c:193
-#, fuzzy
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
@@ -15248,8 +15280,8 @@ msgstr "巴西萄文"
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  NOTE「普什圖」在三地都看來是較正常的譯法
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
 #: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "普什圖文"
@@ -15269,10 +15301,10 @@ msgstr "斯洛伐克文"
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#  NOTE 港譯「斯洛文尼亞」，臺譯「斯洛維尼亞」。粵語「文」字為Ｍ起音，
-#  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
-#  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
-#  NOTE【參見「Italian」】
+#  NOTE 港譯「斯洛文尼亞」，臺譯「斯洛維尼亞」。粵語「文」字為Ｍ起音，
+#  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
+#  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
+#  NOTE【參見「Italian」】
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "斯洛文尼亞文"
@@ -15291,13 +15323,13 @@ msgstr "瑞典文"
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-# NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
 #: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "泰米爾文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 #: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "德拉威文"
@@ -15332,18 +15364,18 @@ msgstr "繁體中文"
 msgid "Traditional Chinese"
 msgstr "繁體中文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:411
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -15354,112 +15386,114 @@ msgid ""
 "is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時"
-"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
-"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>å€˜è‹¥ä½ å¸Œæœ›ä¿®"
-"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內"
-"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全"
-"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
-"何保用。<BR><BR>"
+msgstr "%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>å€˜è‹¥ä½ å¸Œæœ›ä¿®æ”¹æˆ–ç™¼ä½ˆé€™å€‹ç¨‹å¼ï¼Œåªéœ€æŒ‰ç…§ GPL（任擇第二版或較新的其他版本）的條款即可；%s 內已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+#: ../pidgin/gtkdialogs.c:429
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin é »é“<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin é »é“<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
-# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
-# NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:438
+# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
-# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
-# NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
+# NOTE 參見「Crazy Patch Writer」條
+#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
-msgstr "狂熱的模組作者"
+msgstr "前任的狂熱模組作者"
 
-#  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:483
+#  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "前任譯者"
 
-# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:536
+# NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:906
+# NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../pidgin/gtkdialogs.c:769
+msgid "Buddy"
+msgstr "好友"
+
+#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:922
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦æŸ¥è©¢å°è±¡çš„å¸³è™Ÿã€‚"
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1014
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€æƒ³è¦è®€å–æ—¥èªŒçš„ä½¿ç”¨è€…çš„å¸³è™Ÿæˆ–åˆ¥åã€‚"
 
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1020
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "ç‚ºé€™çµ„å¥½å‹åŠ ä¸Šåˆ¥å"
 
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1021
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "ç‚ºé€™å€‹å¥½å‹åŠ ä¸Šåˆ¥å"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1120
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15467,122 +15501,116 @@ msgid_plural ""
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"ä½ æ­£å˜—è©¦å°‡å¥½å‹ %s 及相關的其他 %d å€‹å¥½å‹å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•"
-"作嗎？"
-msgstr[1] ""
-"ä½ æ­£å˜—è©¦å°‡å¥½å‹ %s 及相關的其他 %d å€‹å¥½å‹å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•"
-"作嗎？"
+msgstr[0] "ä½ æ­£å˜—è©¦å°‡å¥½å‹ %s 及相關的其他 %d å€‹å¥½å‹å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
+msgstr[1] "ä½ æ­£å˜—è©¦å°‡å¥½å‹ %s 及相關的其他 %d å€‹å¥½å‹å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1114
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1117
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
-# TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1148
+# TODO 譯文有待改進 - 20061025
+#: ../pidgin/gtkdialogs.c:1162
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "ä½ æ­£å˜—è©¦å°‡ç¾£çµ„ %s 與 %s åˆä½µï¼Œæ–°ç¾£çµ„ä»¥å¾Œè€…å‘½åã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "合併羣組"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "合併羣組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
-msgstr ""
-"ä½ æ­£å˜—è©¦å°‡ç¾£çµ„ %s åŠç›¸é—œçš„æˆå“¡å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
+msgstr "ä½ æ­£å˜—è©¦å°‡ç¾£çµ„ %s åŠç›¸é—œçš„æˆå“¡å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "移除羣組"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "移除羣組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "ä½ æ­£å˜—è©¦å°‡ %s  å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1250
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1253
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "ä½ æ­£å˜—è©¦å°‡ %s å¾žä½ çš„å¥½å‹æ¸…å–®ä¸­ç§»é™¤ã€‚ä½ è¦ç¹¼çºŒé€™å€‹å‹•ä½œå—Žï¼Ÿ"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
-#  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:150
+#  NOTE 譯文更動 by Ambrose
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "更改狀態"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "有新訊息時閃動"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "結束程式"
 
-#  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
+#  NOTE 這是指「未開始」傳輸檔案，不是「未啟動」
 #: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "未開始"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>以何身分接收：</b>"
@@ -15595,7 +15623,7 @@ msgstr "<b>傳送到：</b>"
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到：</b>"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>以何身分傳送：</b>"
@@ -15627,7 +15655,7 @@ msgstr "檔名："
 msgid "Filename:"
 msgstr "檔名："
 
-# NOTE Debian 譯「local」為「本地端」
+# NOTE Debian 譯「local」為「本地端」
 # XXX
 #: ../pidgin/gtkft.c:698
 msgid "Local File:"
@@ -15653,7 +15681,7 @@ msgstr "清除已完成的傳輸(_C)"
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #. "Download Details" arrow
 #: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
@@ -15669,45 +15697,45 @@ msgstr "恢復(_R)"
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#  NOTE Nautilus譯「貼上文本」，Abiwordè­¯ã€Œæœªæ ¼å¼åŒ–è²¼ä¸Šã€ï¼Œè½ä¾†éƒ½æœ‰äº›æ€ª
-#: ../pidgin/gtkimhtml.c:816
+#  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–(_R)"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "ç•¶æ»‘é¼ ç¶“éŽé€£çµæ™‚çš„é€£çµé¡è‰²ã€‚"
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3369
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15717,8 +15745,8 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG æ ¼å¼
-#: ../pidgin/gtkimhtml.c:3372
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15728,7 +15756,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15739,7 +15767,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15750,12 +15778,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "儲存圖像"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3506
 msgid "_Save Image..."
 msgstr "儲存圖像(_S)..."
 
@@ -15763,202 +15790,185 @@ msgstr "選擇字型"
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€è¦æ’å…¥çš„ URL 及它的描述，描述是選擇性的，可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€è¦æ’å…¥çš„ URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "åŠ å…¥é€£çµ"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存圖像：%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "插入圖像"
 
-#  XXX è­¯æ–‡ä¸é€šé †
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#  XXX 譯文不通順
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
-msgstr "å­—åž‹"
+msgstr "å­—åž‹(_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+# XXX 暫譯
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
-msgstr "羣組 ID："
+msgstr "建立羣組"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
-msgstr ""
+msgstr "解除羣組"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "ç²—é«”"
 
-# NOTE「Italicã€æœ¬ä¾†æ˜¯æŒ‡æŸç¨‹åº¦ä¸Šæ¨¡ä»¿æ‰‹å¯«ã€ä»¥æ›²ç·šç‚ºä¸»çš„å­—åž‹ï¼Œã€Œæ–œé«”ã€å…¶å¯¦æ˜¯èª¤è­¯ï¼Œä½†å·²æ ¹æ·±è’‚å›ºï¼Œä¸å¯èƒ½æ”¹æ­£
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
-msgstr ""
+msgstr "刪除線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Increase Font Size"
-msgstr ""
+msgstr "放大字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Font Face"
 msgstr "å­—åž‹"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Background Color"
 msgstr "背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
+#  XXX 譯「文字顏色」會否較好？ - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "前景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "æ¸…é™¤æ ¼å¼åŒ–"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
 msgstr "插入圖像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
-msgstr "<b>密碼：</b>"
+msgstr "<b>ç²—é«”(_B)</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
-msgstr " <i>(IRC 操作者)</i>"
+msgstr "<i>斜體(_I)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
-msgstr "底線"
+msgstr "<u>底線(_U)</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#  NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法）
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgstr "<span strikethrough='true'>刪除線</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>儲存圖像途中發生錯誤</span>\n"
-"\n"
-"%s"
+msgstr "<span size='larger'>放大(_L)</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
-msgstr "正常"
+msgstr "正常(_N)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+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:1191
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
-msgstr "å­—åž‹"
+msgstr "å­—åž‹(_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+#  XXX 譯「文字顏色」會否較好？ - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
-msgstr "前景顏色"
+msgstr "前景顏色(_C)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
-msgstr "背景顏色"
+msgstr "背景顏色(_K)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "笑一個！"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
-msgstr "儲存圖像"
+msgstr "圖像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
-msgstr "登入(_L)"
+msgstr "連結(_L)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "æ©«ç·š(_H)"
 
-#  XXX ä¸é€šé † - ambrose 20070415
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "笑一個(_S)！"
+
+#  XXX 不通順 - ambrose 20070415
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15980,13 +15990,13 @@ msgstr "ä½ ç¢ºå®šä½ è¦åˆªé™¤ç”±%s開始
 "s?"
 msgstr "ä½ ç¢ºå®šä½ è¦åˆªé™¤ç”±%s開始記錄的系統日誌？"
 
-#  NOTE 第一個 %s 是聊天室名稱，第二個 %s 是時間
+#  NOTE 第一個 %s 是聊天室名稱，第二個 %s 是時間
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
-#  NOTE 第一個 %s 是聯絡人名稱，第二個 %s 是時間
+#  NOTE 第一個 %s 是聯絡人名稱，第二個 %s 是時間
 #: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
@@ -16000,9 +16010,7 @@ msgid ""
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
-msgstr ""
-"åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰ç‹€æ…‹æ”¹è®Šè‡³ç³»çµ±æ—¥èªŒã€é¸é …è¢«å•Ÿå‹•æ™‚ï¼Œç³»çµ±äº‹ä»¶æ‰æœƒè¢«è¨˜éŒ„åˆ°ç³»çµ±æ—¥"
-"誌中。"
+msgstr "åªæœ‰åœ¨ã€Œè¨˜éŒ„æ‰€æœ‰ç‹€æ…‹æ”¹è®Šè‡³ç³»çµ±æ—¥èªŒã€é¸é …è¢«å•Ÿå‹•æ™‚ï¼Œç³»çµ±äº‹ä»¶æ‰æœƒè¢«è¨˜éŒ„åˆ°ç³»çµ±æ—¥èªŒä¸­ã€‚"
 
 #: ../pidgin/gtklog.c:554
 msgid ""
@@ -16028,28 +16036,29 @@ msgstr "全部日誌大小："
 msgid "Total log size:"
 msgstr "全部日誌大小："
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -16061,6 +16070,7 @@ msgid ""
 "  -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"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -16069,15 +16079,17 @@ msgstr ""
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
 "  -h, --help          顯示輔助訊息並離開\n"
+"  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
 "  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
 "哪些帳號，並使用逗號分隔) \n"
+"  --display=DISPLAY   使用指定的 X display\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:512
+#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%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"
 "\n"
@@ -16099,48 +16111,48 @@ msgstr ""
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ä½ æœ‰éƒµä»¶ï¼</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>ä½ æœ‰ %d 封新郵件。</b>"
-msgstr[1] "<b>ä½ æœ‰ %d 封新郵件。</b>"
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d 封新郵件。</b>"
+msgstr[1] "<b>%d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "ç„¡æ³•é–‹å•Ÿç¶²é "
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "ä½ é¸ç”¨äº†ã€Œä½¿ç”¨è€…è‡ªå®šç€è¦½å™¨ã€ï¼Œå»æœªæœ‰è¨­å®šæŒ‡ä»¤ã€‚"
@@ -16157,7 +16169,17 @@ msgstr "卸載模組"
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "無法卸載模組"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr "目前無法卸載模組，但用戶端下次啟動時模組將被停用。"
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16168,7 +16190,7 @@ msgstr ""
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -16179,11 +16201,11 @@ msgstr ""
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -16192,131 +16214,128 @@ msgstr "選擇檔案"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "é–’ç½®(_I)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "é è¦½(_V)"
 
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
-msgstr "重複發生(_R)"
+msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
 #: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
 msgid "Default"
-msgstr "(é è¨­)"
+msgstr "é è¨­"
 
-# XXX 要覆查 - 20061025
+# XXX 要覆查 - 20061025
 #: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "無法打開表情主題。"
 
+#  NOTE 直譯「安裝主題」好像很無棱兩可，加個「檔」字好像較好
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr ""
+msgstr "安裝主題檔"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"åœ¨ä¸‹é¢çš„æ¸…å–®ä¸­é¸å–ä¸€å€‹ä½ æ‰€æƒ³å–œæ­¡çš„è¡¨æƒ…ä¸»é¡Œã€‚ä½ å¯ä»¥ç”¨æ‹–æ›³çš„æ–¹å¼å°‡æ–°çš„è¡¨æƒ…ä¸»é¡Œ"
-"安裝到清單中。"
+msgstr "åœ¨ä¸‹é¢çš„æ¸…å–®ä¸­é¸å–ä¸€å€‹ä½ æ‰€æƒ³å–œæ­¡çš„è¡¨æƒ…ä¸»é¡Œã€‚ä½ å¯ä»¥ç”¨æ‹–æ›³çš„æ–¹å¼å°‡æ–°çš„è¡¨æƒ…ä¸»é¡Œå®‰è£åˆ°æ¸…å–®ä¸­ã€‚"
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "圖示"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
@@ -16324,242 +16343,277 @@ msgstr "有未讀訊息時"
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "隱藏即時訊息交談視窗"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "離開期間"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "åˆ†é "
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "ä½¿ç”¨åˆ†é è¦–çª—é¡¯ç¤ºå³æ™‚è¨Šæ¯å’ŒèŠå¤©(_T)"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "åœ¨åˆ†é ä¸Šé¡¯ç¤ºé—œé–‰éµ(_U)"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "標籤位置(_P)："
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "視窗上方"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "視窗左側"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "視窗右側"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "新交談(_E)："
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "é¡¯ç¤ºæ‰€æ”¶è¨Šæ¯çš„æ ¼å¼åŒ–(_F)"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+#  TODO 要覆查 - acli 20070918
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "é—œé–‰åˆ†é æ™‚éš¨å³é—œé–‰åˆ†é å…§æ‰€æœ‰çš„å³æ™‚é€šè¨Š"
+
+#  TODO 要覆查 - acli 20070912
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
-msgstr "顯示登入資訊"
+msgstr "顯示詳細資訊(_D)"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "é€šçŸ¥ä½ çš„å¥½å‹ä½ æ­£åœ¨ç™¼è¨Šæ¯çµ¦ä»–å€‘(_N)"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
-msgstr "浮現交談視窗(_A)"
+msgstr "最小化所有新交談視窗(_Z)"
 
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1027
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: ../pidgin/gtkprefs.c:1025
+#  XXX 要覆查 - acli 20070614
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "使用主題指定的文件字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
-msgstr ""
+msgstr "使用主題指定的字型(_T)"
 
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
-msgstr "交談視窗的輸入欄位"
+msgstr "交談用的字型(_F)："
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "é è¨­æ ¼å¼"
 
-# NOTE 這不是說明文，而是樣本本身，玩死人了 :P
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
+# NOTE 這不是說明文，而是樣本本身，玩死人了 :P
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
-msgstr ""
-"é€™æ˜¯ä¸€å€‹æ¨£æœ¬ã€‚å‡å¦‚ä½ ä½¿ç”¨çš„å”å®šæ”¯æ´æ ¼å¼åŒ–ï¼Œé€å‡ºè¨Šæ¯çš„å¼æ¨£å°‡æœƒé¡žä¼¼é€™æ®µæ–‡å­—ã€‚"
+msgstr "é€™æ˜¯ä¸€å€‹æ¨£æœ¬ã€‚å‡å¦‚ä½ ä½¿ç”¨çš„å”å®šæ”¯æ´æ ¼å¼åŒ–ï¼Œé€å‡ºè¨Šæ¯çš„å¼æ¨£å°‡æœƒé¡žä¼¼é€™æ®µæ–‡å­—ã€‚"
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "無法啟動代理伺服器設定程式。"
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "無法啟動瀏覽器設定程式。"
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "é€šè¨ŠåŸ "
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "è‡ªå®šé€šè¨ŠåŸ ç›£è½ç¯„åœ(_M)"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "å•Ÿå§‹é€šè¨ŠåŸ (_S)："
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "çµæŸé€šè¨ŠåŸ (_E)："
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "代理伺服器及瀏覽器"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>找不到代理伺服器設定程式。</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>找不到瀏覽器設定程式。</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
+
+#: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "設定代理伺服器(_P)"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "設定瀏覽器(_B)"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-# NOTE ç†ç”±åŒå‰ï¼Œä¸ç”¨ã€Œæ¯‹é ˆã€ï¼Œæ”¹ç‚ºã€Œä¸ä½¿ç”¨ã€
-#: ../pidgin/gtkprefs.c:1207
+# NOTE 理由同前，不用「毋須」，改為「不使用」
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "GNOMEé è¨­"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O)："
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "ç€è¦½å™¨é è¨­"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "æ–°åˆ†é "
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16568,69 +16622,63 @@ msgstr ""
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "æ—¥èªŒæ ¼å¼(_F)："
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16639,83 +16687,82 @@ msgstr ""
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "ä»¥éµç›¤åŠæ»‘é¼ çš„ä½¿ç”¨ç‚ºåŸºæº–"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
-# NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+# NOTE 譯文更動 by Ambrose
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
-msgstr "閒置多少分鐘設為離開(_M)："
+msgstr "閒置多少分鐘更改狀態(_M)："
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -16739,104 +16786,104 @@ msgstr "封鎖以下的使用者"
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "私隱設定"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "私隱設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "帳號："
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "è¼¸å…¥ä½ æ‰€è¨±å¯è¯çµ¡ä½ çš„ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "è«‹è¼¸å…¥ä½ æ‰€è¨±å¯è¯çµ¡ä½ çš„ä½¿ç”¨è€…çš„åç¨±ã€‚"
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s è¯çµ¡ä½ ï¼Ÿ"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "ä½ ç¢ºå®šè¨±å¯ %s è¯çµ¡ä½ å—Žï¼Ÿ"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "è«‹è¼¸å…¥è¢«ä½ æ‹’çµ•çš„ä½¿ç”¨è€…çš„åç¨±ã€‚"
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s？"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "ä½ ç¢ºå®šè¦æ‹’çµ• %s？"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "ä½ è¦è¦†è“‹å®ƒå—Žï¼Ÿ"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "新增聊天室(_A)"
 
@@ -16845,7 +16892,7 @@ msgstr "ä½ ç¢ºå®šä½ è¦åˆªé™¤è¢«é¸å–çš
 msgstr "ä½ ç¢ºå®šä½ è¦åˆªé™¤è¢«é¸å–çš„ç‹€æ…‹ï¼Ÿ"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -16853,30 +16900,30 @@ msgstr "目前標題正在使用中。ä½
 msgid "Title already in use.  You must choose a unique title."
 msgstr "ç›®å‰æ¨™é¡Œæ­£åœ¨ä½¿ç”¨ä¸­ã€‚ä½ å¿…é ˆé¸å–ä¸€å€‹å”¯ä¸€çš„æ¨™é¡Œã€‚"
 
-# TODO - 這個有點不妥，但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:970
+# TODO - 這個有點不妥，但想不到更好的 - 20061123
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "狀態(_S)："
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
@@ -16885,93 +16932,94 @@ msgstr "等待網絡連線..."
 msgid "Waiting for network connection"
 msgstr "等待網絡連線..."
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "新增狀態..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "狀態清單..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "讀取圖像失敗"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s æ²’æœ‰è¾¦æ³•å‚³é€ç›®éŒ„ï¼Œä½ éœ€è¦å€‹åˆ¥å‚³é€ç›®éŒ„å…§çš„æª”æ¡ˆã€‚"
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "ä½ æ‹–æ›³äº†ä¸€å€‹åœ–åƒ"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
-"ä½ å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”"
-"給這個使用者。"
+msgstr "ä½ å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”çµ¦é€™å€‹ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "傳送圖像檔"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "ä½ è¦æŠŠå®ƒè¨­ç‚ºé€™å€‹ä½¿ç”¨è€…çš„å¥½å‹åœ–ç¤ºå—Žï¼Ÿ"
 
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr ""
-"ä½ å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”"
-"給這個使用者。"
+msgstr "ä½ å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”çµ¦é€™å€‹ä½¿ç”¨è€…ã€‚"
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr ""
-"ä½ å¯ä»¥é€éŽæ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”çµ¦é€™å€‹ä½¿ç”¨"
-"者。"
+msgstr "ä½ å¯ä»¥é€éŽæ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒæª”çµ¦é€™å€‹ä½¿ç”¨è€…ã€‚"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * 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:1610
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "ä½ æ‹–æ›³äº†ä¸€å€‹å•Ÿå‹•å™¨ï¼›ä½ å¤§æ¦‚æƒ³å‚³é€å•Ÿå‹•å™¨è¦å•Ÿå‹•çš„æª”æ¡ˆï¼Œè€Œä¸æ˜¯å•Ÿå‹•å™¨æœ¬èº«ã€‚"
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16982,25 +17030,25 @@ msgstr ""
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17038,58 +17086,57 @@ msgstr "開啟郵件(_O)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+# NOTE 這是「Default」表情主題的說明
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "Pidgin"
+msgstr "為 Pidgin 特別設計的表情圖示"
 
+# NOTE 這是「none」表情主題的標題（太奇怪了，這是沒有圖示的主題喎）
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
+msgstr "不使用表情圖示，選擇這個主題即可。"
 
-# TODO 要覆查 - 20061028
+# NOTE 這個「none」是「none」表情主題（不使用圖示）的主題名稱(?!)
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "(沒有名字)"
+msgstr "ç„¡"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "顯示統計資料"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "統計設定"
 
-#  NOTE 參閱 gtk/plugins/cap/README
+#  NOTE 參閱 gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限："
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr ""
 
-#  NOTE 參閱 gtk/plugins/cap/README
-#  FIXME 但這只能是暫譯，譯文絕對有待改進
+#  NOTE 參閱 gtk/plugins/cap/README
+#  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "精密度："
 
@@ -17099,24 +17146,22 @@ msgstr "精密度："
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬æ¨¡çµ„"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
-msgstr ""
-"å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬æ¨¡çµ„ (contact availability plugin, 或稱 cap) 提供有關好友清單"
-"內好友的統計資料。"
+msgstr "å¥½å‹åœ¨ç·šç‹€æ…‹é æ¸¬æ¨¡çµ„ (contact availability plugin, 或稱 cap) 提供有關好友清單內好友的統計資料。"
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17143,7 +17188,7 @@ msgstr "個別好友狀態的得分值ï¼
 msgid "Point values to use when..."
 msgstr "個別好友狀態的得分值："
 
-# NOTE 每行不可太長，並要人手用「\n」分隔，否則視窗會過闊
+# NOTE 每行不可太長，並要人手用「\n」分隔，否則視窗會過闊
 #: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
@@ -17153,12 +17198,12 @@ msgstr ""
 "所指定的得分值計分，積分最多者為「優先」，成為當時實際\n"
 "使用的好友帳號。\n"
 
-# NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) æ ¸å¯¦ï¼Œæ–°ç‰ˆ (2.0) Pidgin è­¯æ–‡è¦é‡æ–°æ ¸å¯¦
+# NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) 核實，新版 (2.0) Pidgin 譯文要重新核實
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "得分相同時，使用最後（而非最先）一個匹配的好友帳號"
 
-# NOTE 怪怪的，不知道指的是什麼?!
+# NOTE 怪怪的，不知道指的是什麼?!
 #: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "個別帳號的得分值"
@@ -17169,26 +17214,24 @@ msgstr "個別帳號的得分值"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "è®“ä½ è‡ªå®šå„å€‹å¥½å‹ç‹€æ…‹çš„å¾—åˆ†å€¼ã€‚"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr ""
-"è®“ä½ è‡ªå®šã€Œé–’ç½®ã€ã€ã€Œé›¢é–‹ã€åŠã€Œé›¢ç·šã€ç‹€æ…‹çš„å¾—åˆ†å€¼ï¼Œä»¥ä¾¿è¨ˆç®—å¥½å‹å¸³è™Ÿçš„å„ªå…ˆæ¬¡"
-"序。"
+msgstr "è®“ä½ è‡ªå®šã€Œé–’ç½®ã€ã€ã€Œé›¢é–‹ã€åŠã€Œé›¢ç·šã€ç‹€æ…‹çš„å¾—åˆ†å€¼ï¼Œä»¥ä¾¿è¨ˆç®—å¥½å‹å¸³è™Ÿçš„å„ªå…ˆæ¬¡åºã€‚"
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
@@ -17202,7 +17245,7 @@ msgstr "錯誤訊息"
 msgid "Error Messages"
 msgstr "錯誤訊息"
 
-# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」，但譯文可以改進 - Ambrose 20061029
 #: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "反白訊息"
@@ -17219,7 +17262,7 @@ msgstr "收到訊息"
 msgid "Received Messages"
 msgstr "收到訊息"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
@@ -17255,7 +17298,7 @@ msgstr "視窗內之交談個數上限"
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
-#  XXX è¦æ ¸å¯¦è­¯æ–‡ï¼
+#  XXX 要核實譯文！
 #: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "æ ¹æ“šäº¤è«‡å€‹æ•¸æ”¾ç½®æ–°äº¤è«‡æ™‚ï¼Œä»¥ä¸åŒçš„è¦–çª—é¡¯ç¤ºå³æ™‚è¨Šæ¯å’ŒèŠå¤©"
@@ -17276,7 +17319,7 @@ msgstr "äº¤è«‡è¦–çª—ä½ç½®é¡å¤–é¸é …ã€
 msgid "Extra conversation placement options."
 msgstr "äº¤è«‡è¦–çª—ä½ç½®é¡å¤–é¸é …ã€‚"
 
-#  XXX 譯得很差，請改良 :-(
+#  XXX 譯得很差，請改良 :-(
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
@@ -17337,8 +17380,8 @@ msgstr ""
 "往上後向左拖曳為切換到前一個交談。\n"
 "往上後向右拖曳為切換到下一個交談。"
 
-#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」，我覺得有點離譜
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」，我覺得有點離譜
+#  NOTE 譯文更動 by Ambrose
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "即時傳訊帳號"
@@ -17353,7 +17396,7 @@ msgstr "羣組："
 msgid "Group:"
 msgstr "羣組："
 
-#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
+#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
@@ -17366,23 +17409,21 @@ msgstr "選擇好友"
 msgid "Select Buddy"
 msgstr "選擇好友"
 
-#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
+#  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr ""
-"è«‹å¾žä½ çš„ç›®éŒ„æœå‹™é¸æ“‡ä¸€å€‹è¯çµ¡äººï¼Œå¥½æŠŠé€™å€‹å¥½å‹åŠ é€²åŽ»ï¼›ä½ äº¦å¯ä»¥é¸æ“‡æ–°å¢žä¸€å€‹è¯çµ¡"
-"人。"
+msgstr "è«‹å¾žä½ çš„ç›®éŒ„æœå‹™é¸æ“‡ä¸€å€‹è¯çµ¡äººï¼Œå¥½æŠŠé€™å€‹å¥½å‹åŠ é€²åŽ»ï¼›ä½ äº¦å¯ä»¥é¸æ“‡æ–°å¢žä¸€å€‹è¯çµ¡äººã€‚"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "使用者細節 (_D)"
 
-# XXX æš«è­¯
+# XXX 暫譯
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
@@ -17401,7 +17442,7 @@ msgstr "找不到與這個好友相關çš
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
-#  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
+#  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "å¢žåŠ åˆ°é€šè¨ŠéŒ„"
@@ -17457,7 +17498,7 @@ msgstr "帳號類型："
 msgid "Account type:"
 msgstr "帳號類型："
 
-#  NOTE 選擇性資訊
+#  NOTE 選擇性資訊
 #. Optional Information section
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
@@ -17495,13 +17536,15 @@ msgstr "檢查使用者介面的各種ä¿
 msgstr "檢查使用者介面的各種信號是否都能正常運作。"
 
 #: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "好友備註"
+msgstr ""
+"\n"
+"<b>好友備註</b>：%s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "歷史記錄"
 
@@ -17535,17 +17578,17 @@ msgstr "åœ¨å¥½å‹æ¸…å–®å…§åŠ ä¸€å°æ ¼ï¼
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "åœ¨å¥½å‹æ¸…å–®å…§åŠ ä¸€å°æ ¼ï¼Œç”¨ä¾†é¡¯ç¤ºä½ æœ‰æ²’æœ‰æ–°éƒµä»¶ã€‚"
 
-#  FIXME æš«è­¯ - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "標示線"
 
-#  FIXME æš«è­¯ - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "在新訊息旁劃上標示線，以突顯交談內的新訊息。"
 
-#  FIXME æš«è­¯ - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr "在何處使用標示線"
@@ -17558,14 +17601,14 @@ msgstr "聊天視窗(_H)"
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
-# FIXME æš«è­¯ - 20061028
+# FIXME 暫譯 - 20061028
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr "ä½ æ”¶åˆ°ä¸€å€‹éŸ³æ¨‚è¨Šæ¯å·¥ä½œéšŽæ®µçš„è¦æ±‚ï¼Œè«‹æŒ‰MM圖示開始交談。"
 
-# FIXME æš«è­¯ - 20061028
+# FIXME 暫譯 - 20061028
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "成功確定音樂訊息工作階段。"
@@ -17616,8 +17659,7 @@ msgid ""
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
-msgstr ""
-"音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
+msgstr "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17646,15 +17688,15 @@ msgstr "åŠ å…¥æ–°è¨Šæ¯æ•¸ç›®åˆ°è¦–çª—æ¨
 msgid "Insert c_ount of new messages into window title"
 msgstr "åŠ å…¥æ–°è¨Šæ¯æ•¸ç›®åˆ°è¦–çª—æ¨™é¡Œä¸­(_O)"
 
-#  TODO 要覆查 - 20061029
+#  TODO 要覆查 - 20061029
 #. Count xprop method button
 #: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "åŠ å…¥æ–°è¨Šæ¯æ•¸ç›®åˆ° X 屬性中(_X)"
 
-# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
-# NOTE「URGENTã€ä¸€å­—å¤§æ¦‚æ‡‰è©²ä¿ç•™ï¼Œå› ç‚ºçµ•å¤§å¤šæ•¸çš„è¦–çª—ç®¡ç†å“¡éƒ½ä¸æ”¯æ´ï¼Œè€Œä¸”æœƒå¼•è‡´å¥‡æ€ªçš„å¾Œæžœ
-# NOTE 譯文更動 by Ambrose
+# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
+# NOTE「URGENT」一字大概應該保留，因為絕大多數的視窗管理員都不支援，而且會引致奇怪的後果
+# NOTE 譯文更動 by Ambrose
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
@@ -17730,7 +17772,7 @@ msgstr "範例模組————請看ä»
 msgid "An example plugin that does stuff - see the description."
 msgstr "範例模組————請看介紹。"
 
-# NOTE 譯文更動 by Ambrose
+# NOTE 譯文更動 by Ambrose
 #. *  description
 #: ../pidgin/plugins/pidgininc.c:96
 msgid ""
@@ -17748,7 +17790,7 @@ msgstr "游標顏色"
 msgid "Cursor Color"
 msgstr "游標顏色"
 
-#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
+#  XXX 只有一個軟件這樣譯，在無更好的譯文可供參考下暫且借用
 #: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "第二游標顏色"
@@ -17761,46 +17803,37 @@ msgstr "GtkTreeView 水平間隔距離"
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "交談歷史"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "日誌檢視器"
-
-#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:76
+#  XXX 這譯文絶對有問題，但想不到怎樣譯較好 - ambrose 20070415
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17824,46 +17857,46 @@ msgstr ""
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "å­—åž‹"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
-msgstr ""
+msgstr "Gtkrc檔專用工具"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
 # TODO Untranslated
-# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
+# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
 #: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr ""
 
-# NOTE: 舊的譯文不清楚，而且唸起來怪怪的。
+# NOTE: 舊的譯文不清楚，而且唸起來怪怪的。
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "è®“ä½ ç›´æŽ¥è¼¸å…¥æŒ‡ä»¤å°å„ç¨®æ–‡å­—æ¨¡å¼çš„é€šè¨Šå”å®šé€²è¡Œæ“ä½œã€‚"
@@ -17872,24 +17905,19 @@ msgid ""
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"è®“ä½ ç›´æŽ¥è¼¸å…¥æŒ‡ä»¤å°å„ç¨®æ–‡å­—æ¨¡å¼çš„é€šè¨Šå”å®šï¼ˆä¾‹å¦‚ XMPP、MSN、IRC 及 TOC）進行操"
-"作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
+msgstr "è®“ä½ ç›´æŽ¥è¼¸å…¥æŒ‡ä»¤å°å„ç¨®æ–‡å­—æ¨¡å¼çš„é€šè¨Šå”å®šï¼ˆä¾‹å¦‚ XMPP、MSN、IRC 及 TOC）進行操作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
 
-# XXX æš«è­¯
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "ä½ ç›®å‰ä½¿ç”¨çš„ %s 版本為 %s ，最新的版本是 %s。<hr>"
+msgstr "ä½ ç›®å‰ä½¿ç”¨çš„ %s 版本為 %s，最新的版本是 %s。新版本可由以下網址取得：<a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>功能說明：</b>\n"
-"%s<br><br>"
+msgstr "<b>功能說明：</b><br>%s"
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17917,15 +17945,14 @@ msgid ""
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
-msgstr ""
-"不時查看有沒有新版本。一發現有，就隨即連同該版本的功能說明一併通知使用者。"
+msgstr "不時查看有沒有新版本。一發現有，就隨即連同該版本的功能說明一併通知使用者。"
 
-# FIXME 譯文有譯改進 - 20061027
+# FIXME 譯文有譯改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
-msgstr "重複的改正"
+msgstr "重覆的改正"
 
-# FIXME 譯文有譯改進 - 20061027
+# FIXME 譯文有譯改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "æ”¹æ­£åˆ—è¡¨å…§ç¶“å·²å­˜æœ‰ä½ æ‰€æŒ‡å®šçš„å­—è©žã€‚"
@@ -17942,7 +17969,7 @@ msgstr "將會送出"
 msgid "You send"
 msgstr "將會送出"
 
-# XXX 譯文有待改進 - 20061027
+# XXX 譯文有待改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "只匹配完整字詞"
@@ -17963,7 +17990,7 @@ msgstr "將會送出(_S)："
 msgid "You _send:"
 msgstr "將會送出(_S)："
 
-#  XXX åŠ ã€Œé ˆã€å­—æ„æ€è¼ƒç‚ºæ¸…æ¥š - ambrose 20070415
+#  XXX 加「須」字意思較為清楚 - ambrose 20070415
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
@@ -17981,13 +18008,13 @@ msgstr "最後輸入的一個字也進è¡
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "æ ¹æ“šä½¿ç”¨è€…æ‰€å®šç¾©çš„è¦å‰‡ä¾†å–ä»£é€å‡ºè¨Šæ¯ä¸­çš„æ–‡å­—ã€‚"
+msgstr "æ ¹æ“šç…§ä½¿ç”¨è€…æ‰€å®šç¾©çš„è¦å‰‡ä¾†å–ä»£é€å‡ºè¨Šæ¯ä¸­çš„æ–‡å­—ã€‚"
 
 #. *< type
 #. *< ui_requirement
@@ -17995,7 +18022,7 @@ msgstr "æ ¹æ“šä½¿ç”¨è€…æ‰€å®šç¾©çš„è¦å‰
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "好友跑馬燈"
 
@@ -18003,7 +18030,7 @@ msgstr "好友跑馬燈"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
@@ -18038,7 +18065,6 @@ msgstr "æ™‚é–“æˆ³è¨˜æ ¼å¼é¸é …"
 msgstr "æ™‚é–“æˆ³è¨˜æ ¼å¼é¸é …"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24å°æ™‚åˆ¶æ™‚é–“æ ¼å¼(_F)"
 
@@ -18055,7 +18081,7 @@ msgstr "未讀訊息"
 msgid "For delayed messages"
 msgstr "未讀訊息"
 
-#  TODO 要覆查譯文
+#  TODO 要覆查譯文
 #: ../pidgin/plugins/timestamp_format.c:41
 #: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
@@ -18112,7 +18138,7 @@ msgstr "在即時訊息視窗取得焦é»
 msgid "Remove IM window transparency on focus"
 msgstr "在即時訊息視窗取得焦點時移除透明度"
 
-# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
+# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
@@ -18205,7 +18231,7 @@ msgstr "提供 Windows 版 Pidgin 的相
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin çš„ç›¸é—œé¸é …ï¼Œä¾‹å¦‚å¥½å‹æ¸…å–®çš„åœé§åŠŸèƒ½ã€‚"
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已登出。</font>"
 
@@ -18215,288 +18241,1088 @@ msgstr "<font color='#777777'>已登出ã
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP 監控器"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "帳號："
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE Jabber 的「stanza」譯「段落」，下同
-#: ../pidgin/plugins/xmppconsole.c:790
+#  NOTE Jabber 的「stanza」譯「段落」，下同
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "插入 <presence/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "插入 <message/> 段落。"
 
-#  XXX 暫依日文譯 raw ç‚ºã€ŒæœªåŠ å·¥ã€
+#  XXX 暫依日文譯 raw 為「未加工」
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "é€å‡ºã€è®€å–æœªåŠ å·¥çš„ XMPP 段落。"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "顯示離線好友"
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "卸載模組途中遭遇錯誤。"
 
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "é€šè¨ŠåŸ "
+#~ msgid "Couldn't open file"
+#~ msgstr "無法開啟檔案"
 
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "æ ¹æ“šç‹€æ…‹"
+# XXX 譯文有待改進
+#~ msgid "Error initializing session"
+#~ msgstr "對工作階段進行初始化時發生了錯誤"
 
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "æ ¹æ“šæ—¥èªŒå¤§å°"
-
-#, fuzzy
+# XXX 直譯「好友伺服器」好像不太妥
 #~ msgid "Unable to connect to contact server"
-#~ msgstr "無法連線到伺服器。"
+#~ msgstr "無法連線到好友資訊伺服器。"
 
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "選擇 Notes 通訊錄"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "目前密碼"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger 協定模組"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "失敗：認證失敗"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s åœ¨å‘¼å«ä½ ï¼"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "未知錯誤"
-
-#, fuzzy
 #~ msgid "Unable to connect to OIM server"
-#~ msgstr "無法連線到伺服器。"
+#~ msgstr "無法連線到 OIM 伺服器。"
 
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s 從「%s」狀態改變為「%s」"
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s 目前為%s"
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s 不再%s"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
+#~ msgstr ""
+#~ "%s\n"
+#~ "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
 
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "訊息(_M)："
+#~ msgid "Sort by status"
+#~ msgstr "依照狀態排列"
 
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "傳送檔案(_S)"
+#~ msgid "Sort alphabetically"
+#~ msgstr "依照字母排列"
 
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "åŠ å…¥å¥½å‹ç‹€æ…‹æ•æ‰..."
+#~ msgid "Sort by log size"
+#~ msgstr "依照日誌大小排列"
 
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "在離線時不允許這個指令"
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "加入好友狀態捕捉(_P)"
 
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "在離線時不允許這個指令"
+#~ msgid "Add a _Buddy"
+#~ msgstr "新增一個好友(_B)"
 
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "新增好友"
+#~ msgid "Add a C_hat"
+#~ msgstr "新增一個聊天室(_H)"
 
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "新增聊天室"
+#~ msgid "_Send To"
+#~ msgstr "傳送到(_S)"
 
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "波斯文"
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/帳號(_A)/新增\\/編輯"
 
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/帳號"
+#  XXX
+#~ msgid "_Smiley"
+#~ msgstr "笑一個！(_S)"
 
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "帳號："
+#~ msgid "Conversation History"
+#~ msgstr "交談歷史"
 
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "傳送到"
+#~ msgid "Log Viewer"
+#~ msgstr "日誌檢視器"
 
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s å› ä¸‹åˆ—éŒ¯èª¤çµæŸäº†é€£ç·šï¼š\n"
-#~ "%s"
-
-# NOTE 沒辦法，用不到着重號，又沒法改換字型……
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "å°šæœªæ”¯æ´æŒ‡ä»¤ï¼Œè¨Šæ¯å› æ­¤æ²’æœ‰è¢«é€å‡ºã€‚"
-
 #~ msgid "You have just sent a Nudge!"
-#~ msgstr "ä½ å‰›é€å‡ºäº†ä¸€å€‹å‘¼å«ï¼"
+#~ msgstr "您剛送出了一個呼叫！"
 
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "無法取得使用者 %s 的個人資料："
-
 #~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "ä½ å› ç‚ºä¸æ˜ŽåŽŸå› è€Œç™»å‡ºã€‚"
+#~ msgstr "您因為不明原因而登出。"
 
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "å› ç‚ºä¸æ˜ŽåŽŸå› è€Œç„¡æ³•å°‡å¥½å‹ %s åŠ å…¥ã€‚ä¸€èˆ¬çš„åŽŸå› æ˜¯å› ç‚ºä½ çš„å¥½å‹æ¸…å–®ä¸­çš„å¥½å‹æ•¸ç›®"
-#~ "超過所系統允許的上限。"
-
-#~ msgid "_Connect"
-#~ msgstr "連線(_C)"
-
 #~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "ä½ ç¢ºå®šè¦é›¢é–‹é€™å€‹ç¾£ (Qun) 嗎？"
+#~ msgstr "您確定要離開這個群 (Qun) 嗎？"
 
 #~ msgid "Go ahead"
-#~ msgstr "確定"
+#~ msgstr "確定"
 
 #~ msgid "Server ACK"
-#~ msgstr "伺服器回應"
+#~ msgstr "伺服器回應"
 
-#~ msgid "Send IM fail\n"
-#~ msgstr "送出即時訊息失敗\n"
-
 #~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
+#~ msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
 
 #~ msgid "Request login token error!"
-#~ msgstr "「登入要求」Token 出現錯誤"
+#~ msgstr "「登入要求」Token 出現錯誤"
 
-#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
+#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
 #~ msgid "%s Address"
-#~ msgstr "%s 位址"
+#~ msgstr "%s 位址"
 
 #~ msgid "QQ: Available"
-#~ msgstr "QQ: 上線"
+#~ msgstr "QQ: 上線"
 
 #~ msgid "QQ: Away"
-#~ msgstr "QQ: 離開"
+#~ msgstr "QQ: 離開"
 
 #~ msgid "QQ: Invisible"
-#~ msgstr "QQ: 隱身"
+#~ msgstr "QQ: 隱身"
 
 #~ msgid "QQ: Offline"
-#~ msgstr "QQ: 離線"
+#~ msgstr "QQ: 離線"
 
 #~ msgid "Modify My Information"
-#~ msgstr "修改資訊"
+#~ msgstr "修改資訊"
 
 #~ msgid "Login in TCP"
-#~ msgstr "以 TCP 登入"
+#~ msgstr "以 TCP 登入"
 
 #~ msgid "Login Hidden"
-#~ msgstr "以隱藏狀態登入"
+#~ msgstr "以隱藏狀態登入"
 
 #~ msgid "Socket send error"
-#~ msgstr "寫入 Socket 途中發生錯誤"
+#~ msgstr "寫入 Socket 途中發生錯誤"
 
 # XXX - 20061027
 #~ msgid "Connection refused"
-#~ msgstr "連線被拒"
+#~ msgstr "連線被拒"
 
 #~ msgid "Would like to add him?"
-#~ msgstr "ä½ æƒ³å°‡ä»–ï¼ˆå¥¹ï¼‰åŠ å…¥åˆ°ä½ çš„å¥½å‹æ¸…å–®å—Žï¼Ÿ"
+#~ msgstr "您想將他（她）加入到您的好友清單嗎？"
 
-#  TODO 譯文有待改進，這是意譯
-#~ msgid "Reject watching by other users"
-#~ msgstr "拒絕伺服器端的好友狀態捕捉"
+#  XXX 可能可以譯得生動一點
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s 在呼叫您！"
 
-#~ msgid "Block invites"
-#~ msgstr "拒絕邀請"
+#  XXX 可能可以譯得生動一點
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "您剛送出了一個呼叫！"
 
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "拒絕上線狀態屬性要求"
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/選項/顯示好友圖示(_I)"
 
-#  XXX 可能可以譯得生動一點
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s åœ¨å‘¼å«ä½ ï¼"
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/選項/顯示好友圖示"
 
-#  XXX 可能可以譯得生動一點
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "ä½ å‰›é€å‡ºäº†ä¸€å€‹å‘¼å«ï¼"
+#  XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
+#  XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭……
+#~ msgid "Norwegian"
+#~ msgstr "挪威文"
 
-#~ msgid "Unavailable"
-#~ msgstr "離線"
+#~ msgid "_Bold"
+#~ msgstr "粗體(_B)"
 
-#~ msgid "Alias..."
-#~ msgstr "別名..."
+#~ msgid "_Larger"
+#~ msgstr "放大字體(_L)"
 
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/é¸é …/顯示好友圖示(_I)"
+#~ msgid "_Smaller"
+#~ msgstr "縮小字體(_S)"
 
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/é¸é …/顯示好友圖示"
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
 
+#~ msgid "Show buddy _icons"
+#~ msgstr "顯示好友圖示(_I)"
+
+# NOTE 沒辦法，用不到着重號，又沒法改換字型……
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "尚未支援指令，訊息因此沒有被送出。"
+
+# NOTE 譯文更動 by Ambrose
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "無法取得使用者 %s 的個人資訊："
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目"
+#~ "超過所系統允許的上限。"
+
+#~ msgid "_Connect"
+#~ msgstr "連線(_C)"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "送出即時訊息失敗\n"
+
+#~ msgid "Unavailable"
+#~ msgstr "離線"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/好友/關於 Pidgin(_A)"
+
 #~ msgid "Smaller font size"
-#~ msgstr "縮小字體"
+#~ msgstr "縮小字體"
 
 #~ msgid "Insert link"
-#~ msgstr "插入連結"
+#~ msgstr "插入連結"
 
 #~ msgid "Insert image"
-#~ msgstr "插入圖像"
+#~ msgstr "插入影像"
 
-#~ msgid "Show buddy _icons"
-#~ msgstr "顯示好友圖示(_I)"
+#~ msgid "Tools"
+#~ msgstr "工具"
 
+#  TODO 譯文有待改進，這是意譯
+#~ msgid "Reject watching by other users"
+#~ msgstr "拒絕伺服器端的好友狀態捕捉"
+
+#~ msgid "Block invites"
+#~ msgstr "拒絕邀請"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "拒絕上線狀態屬性要求"
+
+#~ msgid "Alias..."
+#~ msgstr "別名..."
+
 #~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "您可以由下列網址，取得最新的 %s 版：<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>"
+
+#~ msgid ""
 #~ "You can send this image as a file transfer or embed it into this message, "
 #~ "or use it as the buddy icon for this user."
 #~ msgstr ""
-#~ "ä½ å¯ä»¥é€éŽæª”æ¡ˆå‚³è¼¸ã€æ’å…¥è¨Šæ¯ï¼Œæˆ–è€…æŠŠå®ƒç•¶æˆæ˜¯ä½ çš„å¥½å‹åœ–ç¤ºç­‰æ–¹å¼ï¼Œä¾†å‚³é€åœ–åƒ"
-#~ "檔給這個使用者。"
+#~ "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像"
+#~ "檔給這個使用者。"
 
-#~ msgid "Tools"
-#~ msgstr "工具"
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s 因下列錯誤結束了連線：\n"
+#~ "%s"
 
 #~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
 #~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道"
+#~ "<BR><BR>"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示／不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s："
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 這是指模組既沒有設定任何選項，也沒有指明自己是沒有選項的
+#~ msgid "Still need to do something about this."
+#~ msgstr "此模組尚未完成。"
+
+#~ msgid "Autoreply"
+#~ msgstr "自動回覆"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "適用於所有通訊協定的自動回覆"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆，只需在這"
+#~ "模組的選項視窗設定即可；為個別好友設定自動回覆，請在好友清單中以滑鼠右鍵點"
+#~ "擊該個好友；為您的個別帳戶設定自動回覆，請在這模組的選項視窗按「進階」按"
+#~ "紐。"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "設定自動回覆給 %s 的訊息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "設定自動回覆訊息"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "當自動回覆功能啟動後，每當好友給您送出訊息時，下列訊息將被自動送出："
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "設定自動回覆訊息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自動回覆訊息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "何時發出自動回覆"
+
+#~ msgid "When my account is _away"
+#~ msgstr "當我的帳號是在「離開」狀態時(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "當我的帳號是在「閒置」狀態時(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "預設回覆訊息(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "狀態訊息"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "以狀態訊息作為自動回覆"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "每當設定了狀態訊息時"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "只在沒有設定自動回覆訊息時"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "自動回覆之間的相隔時間"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "相隔時間下限（分）(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "送出自動回覆訊息的次數"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "次數上限 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "我現在不在位子上。請您留下您的訊息，當我回來的時候，我將儘快給您回覆。"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "沒有提供密碼，伺服器無法為你進行認證"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速率限制錯誤。"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具/好友狀態捕捉"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克文"
+
+#~ msgid "Gaim Internet Messenger"
+#~ msgstr "Gaim 網路即時通"
+
+#~ msgid ""
+#~ "\n"
+#~ "Idle: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "閒置：%s"
+
+#~ msgid "Nickname: %s\n"
+#~ msgstr "暱稱：%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Nickname:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>暱稱：</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Logged In:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>登入時間：</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>閒置：</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Last Seen:</b> %s ago"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>最後見到：</b>%s 前"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Offline"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態：</b>離線"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Description:</b> Spooky"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>介紹：</b>幽靈似的"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Awesome"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態：</b>頂呱呱"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態：</b>頂呱呱"
+
+#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
+
+#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
+#~ msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">您收到了郵件！</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Delay"
+#~ msgstr "延遲"
+
+#~ msgid "minutes."
+#~ msgstr "分鐘。"
+
+#~ msgid "WinGaim Options"
+#~ msgstr "WinGaim 選項"
+
+#~ msgid ""
+#~ "%d buddy from group %s was not removed because it belongs to an account "
+#~ "which is disabled or offline.  This buddy and the group were not "
+#~ "removed.\n"
+#~ msgid_plural ""
+#~ "%d buddies from group %s were not removed because they belong to accounts "
+#~ "which are currently disabled or offline.  These buddies and the group "
+#~ "were not removed.\n"
+#~ msgstr[0] ""
+#~ "%d 個在 %s 群組的好友並沒有被移除，因為他（她）所對應的帳號被停用或已離"
+#~ "線。這個好友及群組沒有被移除。\n"
+#~ msgstr[1] ""
+#~ "%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號被停用或已離線。這"
+#~ "些好友及這個群組沒有被移除。\n"
+
+#~ msgid "Group not removed"
+#~ msgstr "群組未被移除"
+
+#~ msgid "Old Gaim"
+#~ msgstr "舊版 Gaim"
+
+#~ msgid "Gaim encountered errors loading the plugin."
+#~ msgstr "Gaim 讀入模組時發生錯誤。"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態：</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>訊息：</b>%s"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim 使用者"
+
+#~ msgid "<b>%s:</b> %s"
+#~ msgstr "<b>%s：</b>%s"
+
+#~ msgid "<b>%s:</b> %s<br>"
+#~ msgstr "<b>%s：</b>%s<br>"
+
+#~ msgid "<b>Idle for:</b> %s<br>"
+#~ msgstr "<b>閒置了：</b>%s<br>"
+
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
+#~ msgid "Client:"
+#~ msgstr "用戶端："
+
+#~ msgid "The user %s wants to add %s to his or her buddy list."
+#~ msgstr "使用者 %s 想要將 %s 加入他（她）的好友清單。"
+
+#~ msgid "_Authorize"
+#~ msgstr "給予認證(_A)"
+
+#~ 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>"
+
+#~ msgid "<b>%s:</b> "
+#~ msgstr "<b>%s：</b>"
+
+#~ msgid "%s<b>General</b><br>%s"
+#~ msgstr "%s<b>簡介</b><br>%s"
+
+# XXX - 20061028
+#~ msgid "%s<b>Social</b><br>%s"
+#~ msgstr "%s<b>社交方面</b><br>%s"
+
+#~ msgid "<br><b>Personal</b><br>%s"
+#~ msgstr "<br><b>個人方面</b><br>%s"
+
+#~ msgid "<br><b>Business</b><br>%s"
+#~ msgstr "<br><b>工作方面</b><br>%s"
+
+#~ msgid "<hr><b>Contact Info</b>%s%s"
+#~ msgstr "<hr><b>聯絡資訊</b>%s%s"
+
+#~ msgid "<hr><b>%s:</b> "
+#~ msgstr "<hr><b>%s：</b>"
+
+#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
+#~ msgstr "使用者 %s（%s）想要將 %s 加入他（她）的好友清單。"
+
+#~ msgid ""
+#~ "The user %s requires authorization before being added to a buddy list.  "
+#~ "Do you want to send an authorization request?"
+#~ msgstr ""
+#~ "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎？"
+
+#~ msgid "Request Authorization"
+#~ msgstr "要求認證"
+
+#~ msgid "_Request Authorization"
+#~ msgstr "要求認證(_R)"
+
+#~ msgid ""
+#~ "The user %u wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "使用者 %u 因為下列原因，想要將 %s 加入他（她）的好友清單中：\n"
+#~ "%s"
+
+#~ msgid "Authorization Request"
+#~ msgstr "認證要求"
+
+#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>帳號：</B> %s<BR><B>狀態：</B> %s<HR>%s"
+
+#~ msgid "SNAC threw error: %s\n"
+#~ msgstr "SNAC 丟出錯誤：%s\n"
+
+#~ msgid ""
+#~ "Your screen name is currently formatted as follows:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "您的帳號目前被格式化如下：\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The user %s wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "使用者 %s 因為下列原因，想要將 %s 加入他（她）的好友清單中：\n"
+#~ "%s"
+
+#~ msgid "New screen name formatting:"
+#~ msgstr "新的帳號格式："
+
+#~ msgid "Format Screen Name..."
+#~ msgstr "格式化帳號..."
+
+#  XXX 要覆查
+#~ msgid "Faces"
+#~ msgstr "好友圖示"
+
+#  XXX 要覆查
+#~ msgid "Change Your QQ Face"
+#~ msgstr "更改您的 QQ 好友圖示"
+
+#  XXX 要覆查
+#~ msgid "Change Face"
+#~ msgstr "更改好友圖示"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "<i>Information below may not be accurate</i><br>\n"
+#~ msgstr "【下列資訊可能不準確】<br>\n"
+
+#~ msgid "Please wait for new version"
+#~ msgstr "請等待新版本推出"
+
+# TODO 譯文有待改進 - 20061028
+#~ msgid "User info is not updated"
+#~ msgstr "無法更新使用者資訊"
+
+#~ msgid "Send packet"
+#~ msgstr "傳送封包中"
+
+#~ msgid "Packets lost, send again?"
+#~ msgstr "封包已遺失，重新送出？"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Supports:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>支援：</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>External User</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>外部使用者</b>"
+
+#~ msgid "<b>External User</b><br>"
+#~ msgstr "<b>外部使用者</b><br>"
+
+#~ msgid "<b>User ID:</b> %s<br>"
+#~ msgstr "<b>使用者帳號：</b>%s<br>"
+
+#~ msgid "<b>Full Name:</b> %s<br>"
+#~ msgstr "<b>全名：</b>%s<br>"
+
+#~ msgid "<b>Supports:</b> %s<br>"
+#~ msgstr "<b>支援：</b>%s<br>"
+
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>狀態：</b>%s"
+
+#~ msgid "TOC has sent a PAUSE command."
+#~ msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
+
+#~ msgid ""
+#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
+#~ "off if you send a message. Gaim will prevent anything from going through. "
+#~ "This is only temporary, please be patient."
+#~ msgstr ""
+#~ "當這個發生時，TOC 會忽略所有送來的訊息，同時可能在您送出訊息時，將您踢出系"
+#~ "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態，請您見諒。"
+
+#~ msgid "Gaim - Save As..."
+#~ msgstr "Gaim - 儲存為..."
+
+#~ 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. "
+#~ "Gaim will now attempt to log in using Web Messenger authentication, which "
+#~ "will result in reduced functionality and features."
+#~ msgstr ""
+#~ "無法以正常方法進行認證，這表示您輸入了錯誤的密碼，或者 Yahoo! 更改了認證方"
+#~ "法。Gaim 隨即嘗試透過 Web Messenger 方法認證，這種認證方法只支援部分功能。"
+
+#~ msgid "<b>IP Address:</b> %s<br>"
+#~ msgstr "<b>IP 位址：</b>%s<br>"
+
+#~ msgid "<b>User:</b> %s<br>"
+#~ msgstr "<b>使用者：</b>%s<br>"
+
+#~ msgid "Tag"
+#~ msgstr "標記"
+
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr "指定的好友不在 Evolution 聯絡人清單中。"
+
+#~ msgid "Invalid Username"
+#~ msgstr "使用者名稱無效"
+
+#~ msgid "Invalid password"
+#~ msgstr "密碼無效"
+
+#~ 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 "使用者名稱無效。"
+
+#~ msgid "Wrong password!"
+#~ msgstr "密碼錯誤！"
+
+#~ msgid "Wrong Password"
+#~ msgstr "錯誤的密碼"
+
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "不明的「斜線」指令，一律當成訊息送出(_S)"
+
+#~ msgid "Tab Options"
+#~ msgstr "分頁選項"
+
+#~ msgid "_Sounds while away"
+#~ msgstr "離開時仍發出音效(_S)"
+
+#~ msgid "Away / Idle"
+#~ msgstr "離開 / 閒置"
+
+#~ msgid "gaim_proxy_connect() failed"
+#~ msgstr "gaim_proxy_connect() 失敗"
+
+#~ msgid "mysql"
+#~ msgstr "mysql"
+
+#~ msgid "_Configure"
+#~ msgstr "設定(_C)"
+
+#~ msgid "Host:"
+#~ msgstr "主機位址(_H)："
+
+#~ msgid "Port:"
+#~ msgstr "通訊埠："
+
+#~ msgid "Crazychat"
+#~ msgstr "Crazychat"
+
+#~ msgid "Network Configuration"
+#~ msgstr "網路設定"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP通訊埠"
+
+#~ msgid "UDP port"
+#~ msgstr "UDP通訊埠"
+
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr "有未讀取訊息時，閃爍工作匣圖示..."
+
+#~ msgid "_Instant Messages:"
+#~ msgstr "即時訊息(_I)："
+
+#~ msgid "C_hat Messages:"
+#~ msgstr "聊天訊息(_H)："
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "在系統工作匣中顯示 Gaim 的圖示。"
+
+# NOTE queuing semantics clarified by marv on #gaim
+#~ msgid ""
+#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
+#~ "show the current status of Gaim, allow fast access to commonly used "
+#~ "functions, and to toggle display of the buddy list. Also provides options "
+#~ "to blink for unread messages."
+#~ msgstr ""
+#~ "將 Gaim 目前的狀態，顯示於系統工作匣圖示上（例如於 GNOME、KDE 或微軟視窗"
+#~ "等），同時提供對常用功能的快速操作，以及整合好友清單的顯示。它也提供在收到"
+#~ "未讀取訊息時，閃爍工作匣圖示的功能（可選）。"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
+#~ msgstr ""
+#~ "登入這個伺服器需要使用 TLS/SSL。請在帳號清單的「修改帳號」視窗點選「TLS 可"
+#~ "用則用」選項。"
+
+# XXX 暫譯
+#~ msgid "Use TLS if available"
+#~ msgstr "TLS 可用則用"
+
+#~ msgid "Lost connection with server for an unknown reason."
+#~ msgstr "因為不明原因導致與伺服器連線中斷。"
+
+#~ msgid "A"
+#~ msgstr "A型"
+
+#~ msgid "B"
+#~ msgstr "B型"
+
+#~ msgid "AB"
+#~ msgstr "AB型"
+
+#~ msgid "QQ Server"
+#~ msgstr "QQ 伺服器"
+
+#~ msgid "QQ Port"
+#~ msgstr "QQ 通訊埠"
+
+#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+#~ msgstr "好友「%2$d」拒絕了您傳送檔案「%1$s」的要求"
+
+#~ msgid "Unable to read"
+#~ msgstr "無法讀取"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: 連線開啟錯誤。\n"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "好友圖示："
+
+#~ msgid "IM the user"
+#~ msgstr "送出即時訊息給使用者"
+
+#~ msgid "Ignore the user"
+#~ msgstr "忽略使用者"
+
+#~ msgid "Get the user's information"
+#~ msgstr "取得使用者資訊"
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "無法由伺服器讀取標頭資訊"
+
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr "無法由伺服器讀取資訊：%s。指令為 %hd，長度為 %hd。"
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "使用者：%s，檔案：%s，大小：%sGB"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "無法將「%s」加入您的 Napster 熱門清單中"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s 要求一個 PING"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "NAPSTER 協定模組"
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "無法播放音效，因為選取了「指令」為播放模式，可是並沒有設定任何指令。"
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr "無法播放音效，因為無法執行所設定的音效指令：%s"
+
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "無法啟始一個新的搜尋"
+
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "您有一個處理中的搜尋。請等候它完成。"
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "和 %s 的即時訊息關閉"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "和 %s 的即時訊息失敗"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "無法開啟直接的即時訊息"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "您已經由聊天室 %s 停止連線。"
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "目前無法使用聊天室"
+
+#~ msgid "Auth host"
+#~ msgstr "認證伺服器"
+
+#~ msgid "Auth port"
+#~ msgstr "認證通訊埠"
+
+#~ msgid "TOC host"
+#~ msgstr "TOC 伺服器"
+
+#~ msgid "TOC port"
+#~ msgstr "TOC 通訊埠"
+
+#~ msgid "Pager host"
+#~ msgstr "傳呼系統伺服器"
+
+#~ msgid "YCHT host"
+#~ msgstr "YCHT 主機"
+
+#~ msgid "YCHT port"
+#~ msgstr "YCHT 通訊埠"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s 登出。"
+
+#~ msgid "Start _Voice Chat"
+#~ msgstr "開啟語音聊天"
+
+#~ msgid "Screen Name:"
+#~ msgstr "帳號："
+
+#~ msgid "Background color name"
+#~ msgstr "背景顏色名稱"
+
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "不管這個標籤是否影響背景顏色"
+
+#~ msgid "ComboBox model"
+#~ msgstr "ComboBox樣式"
+
+#~ msgid "The model for the combo box"
+#~ msgstr "Combo Box的樣式"
+
+#~ msgid "Wrap width"
+#~ msgstr "換行寬度"
+
+#~ msgid "Wrap width for layouting the items in a grid"
+#~ msgstr "控制項在 Grid 中顯示的換行寬度"
+
+#~ msgid "Row span column"
+#~ msgstr "橫向跨欄"
+
+#~ msgid "Column span column"
+#~ msgstr "縱向跨欄"
+
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "我在用 Gaim v%s。"
+
+#~ msgid "Call ended."
+#~ msgstr "結束呼叫。"
+
+#~ msgid "End Call"
+#~ msgstr "結束呼叫"
+
+#~ msgid "Receiving call from %s"
+#~ msgstr "收到來息 %s 的呼叫"
+
+#~ msgid "Reject Call"
+#~ msgstr "拒絕呼叫"
+
+#~ msgid "Accept call"
+#~ msgstr "接受呼叫"
+
+#~ msgid "Connected to %s"
+#~ msgstr "已連結到 %s"
+
+#~ msgid "_Mute"
+#~ msgstr "靜音(_M)"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "執行「%s」時發生了錯誤：%s"
+
+#~ msgid "e-Mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "Realname"
+#~ msgstr "姓名"
+
+#~ msgid "EMail"
+#~ msgstr "電子郵件"
+
+#~ msgid "Private Key File"
+#~ msgstr "私鑰檔案"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "再次輸入密碼"
+
+#~ msgid "%s came back"
+#~ msgstr "%s 回來了"
+
+#~ msgid "%s went away"
+#~ msgstr "%s 已經離開"
+
+#~ msgid "(+%d more)"
+#~ msgstr "（以及另外 %d 個）"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " 離開聊天室 (%s)。"
+
+#~ msgid "Offline "
+#~ msgstr "離線"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">來自：</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">主題：</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">您收到了郵件！</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "Pounce Action"
+#~ msgstr "捕捉動作"
+
+#~ msgid "_Warn"
+#~ msgstr "警告(_W)"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber 帳號"
+
+#  NOTE Jabber 術語，見上
+#~ msgid "(pending)"
+#~ msgstr "（等待認證）"
+
+#~ msgid "Hide IP address"
+#~ msgstr "隱藏 IP 位址"
+
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#~ msgid "Web aware"
+#~ msgstr "允許其他使用者在網路上查看您目前的狀態"
-#~ "ä½ å¯ä»¥ç”±ä¸‹åˆ—ç¶²å€ï¼Œå–å¾—æœ€æ–°çš„ %s 版：<br><a href=\"http://pidgin.im/"
-#~ "\">http://pidgin.im</a>"