im.pidgin.pidgin: 79fddfcecc8db6e147a59f1f909bbaa9945b8c2a

-----------------------------------------------------------------
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

============================================================
--- po/ChangeLog	b95d7e708a239a0afa2cf02417b80ef541824ab7
+++ po/ChangeLog	6582f2443435b471c2b1c34a415cf65feb25ab02
 <at>  <at>  -1,9 +1,10  <at>  <at>  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
 <at>  <at>  -1,62 +1,63  <at>  <at> 
 # 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
 <at>  <at>  -91,34 +92,32  <at>  <at>  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 "帳號未被新增"
 <at>  <at>  -137,14 +136,14  <at>  <at>  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 "修改帳號"
 
 <at>  <at>  -175,32 +174,36  <at>  <at>  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
 <at>  <at>  -211,60 +214,60  <at>  <at>  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？"
 <at>  <at>  -275,16 +278,16  <at>  <at>  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 "帳號清單"
 
 <at>  <at>  -294,53 +297,54  <at>  <at>  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 "拒絕"
 
 <at>  <at>  -364,20 +368,21  <at>  <at>  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 "別名"
 
 <at>  <at>  -386,44 +391,49  <at>  <at>  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"
 <at>  <at>  -433,7 +443,7  <at>  <at>  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 "新增聊天室"
 
 <at>  <at>  -453,14 +463,14  <at>  <at>  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 "請給羣組輸入名稱。"
 <at>  <at>  -473,12 +483,12  <at>  <at>  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 "修改設定"
 <at>  <at>  -492,8 +502,8  <at>  <at>  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 "取得資訊"
 <at>  <at>  -503,10 +513,10  <at>  <at>  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 "傳送檔案"
 
 <at>  <at>  -527,7 +537,7  <at>  <at>  msgstr "設定別名"
 msgid "Set Alias"
 msgstr "設定別名"
 
-# FIXME 譯文有待改進 - 20061029
+# FIXME 譯文有待改進 - 20061029
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 <at>  <at>  -551,20 +561,20  <at>  <at>  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 "移動已標記的項目"
 <at>  <at>  -575,51 +585,55  <at>  <at>  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
 <at>  <at>  -645,39 +659,26  <at>  <at>  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 "請輸入你所想要發送即時訊息對象的帳號。"
 <at>  <at>  -685,83 +686,114  <at>  <at>  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
 <at>  <at>  -769,19 +801,20  <at>  <at>  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
 <at>  <at>  -789,23 +822,25  <at>  <at>  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
 <at>  <at>  -815,61 +850,66  <at>  <at>  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"
 <at>  <at>  -877,53 +917,53  <at>  <at>  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"
 <at>  <at>  -932,67 +972,65  <at>  <at>  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"
 <at>  <at>  -1000,60 +1038,65  <at>  <at>  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 "除錯視窗"
 
 <at>  <at>  -1061,15 +1104,15  <at>  <at>  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 "暫停"
 
 <at>  <at>  -1106,25 +1149,27  <at>  <at>  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 "狀態"
 
 <at>  <at>  -1140,7 +1185,7  <at>  <at>  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 "等待開始傳輸檔案中..."
 <at>  <at>  -1153,22 +1198,24  <at>  <at>  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 "傳輸中"
 
 <at>  <at>  -1176,74 +1223,70  <at>  <at>  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"
 <at>  <at>  -1260,19 +1303,40  <at>  <at>  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 "設定模組"
 
 <at>  <at>  -1281,191 +1345,188  <at>  <at>  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 "未知的捕捉事件。請匯報這個問題！"
 
 <at>  <at>  -1473,12 +1534,12  <at>  <at>  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 "從不"
 <at>  <at>  -1512,207 +1573,193  <at>  <at>  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 "選擇..."
 
 <at>  <at>  -1725,21 +1772,22  <at>  <at>  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 "格式"
 <at>  <at>  -1753,41 +1801,44  <at>  <at>  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 "訊息"
 
 <at>  <at>  -1806,7 +1857,7  <at>  <at>  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."
 <at>  <at>  -1839,9 +1890,9  <at>  <at>  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 "音效"
 
 <at>  <at>  -1851,23 +1902,20  <at>  <at>  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"
 <at>  <at>  -1877,12 +1925,12  <at>  <at>  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
 <at>  <at>  -1925,7 +1973,7  <at>  <at>  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 "以下情況下使用多士爐式彈出通知"
 <at>  <at>  -1942,21 +1990,21  <at>  <at>  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"
 <at>  <at>  -1971,11 +2019,11  <at>  <at>  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."
 <at>  <at>  -1988,7 +2036,7  <at>  <at>  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"
 <at>  <at>  -1998,97 +2046,96  <at>  <at>  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"
 <at>  <at>  -2098,58 +2145,62  <at>  <at>  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
 <at>  <at>  -2157,77 +2208,76  <at>  <at>  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"
 <at>  <at>  -2237,21 +2287,25  <at>  <at>  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
 <at>  <at>  -2263,10 +2317,12  <at>  <at>  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 "未知錯誤"
 
 <at>  <at>  -2331,23 +2387,23  <at>  <at>  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 "未命名"
 <at>  <at>  -2360,7 +2416,7  <at>  <at>  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"
 <at>  <at>  -2369,8 +2425,8  <at>  <at>  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"
 <at>  <at>  -2385,16 +2441,15  <at>  <at>  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 "原因不明"
 
 <at>  <at>  -2457,7 +2512,7  <at>  <at>  msgstr "接受來自於「%s」的檔案
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎？"
 
-#  XXX 暫譯
+#  XXX 暫譯
 #: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 <at>  <at>  -2495,7 +2550,6  <at>  <at>  msgstr "檔案 %s 傳送完畢"
 msgstr "檔案 %s 傳送完畢"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
 <at>  <at>  -2505,7 +2559,6  <at>  <at>  msgstr "你取消了 %s 的傳送"
 msgstr "你取消了 %s 的傳送"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
 <at>  <at>  -2695,7 +2748,7  <at>  <at>  msgstr "純文字"
 msgid "Plain text"
 msgstr "純文字"
 
-#  NOTE: xfce 譯「flat file」為「平面檔案」
+#  NOTE: xfce 譯「flat file」為「平面檔案」
 #: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "舊式平面檔案"
 <at>  <at>  -2713,20 +2766,16  <at>  <at>  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>"
 <at>  <at>  -2741,59 +2790,54  <at>  <at>  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 "自動接受"
 <at>  <at>  -2827,18 +2871,19  <at>  <at>  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 "問一問我"
 <at>  <at>  -2865,7 +2910,7  <at>  <at>  msgstr "自動拒絶"
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
-#  NOTE 這些都是視窗標題
+#  NOTE 這些都是視窗標題
 #: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 <at>  <at>  -2891,8 +2936,10  <at>  <at>  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 "備註"
 
 <at>  <at>  -2982,8 +3029,8  <at>  <at>  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 "分鐘數"
 <at>  <at>  -3044,16 +3091,15  <at>  <at>  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
 <at>  <at>  -3072,15 +3118,15  <at>  <at>  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 "設定如何隱藏「加入/離開聊天室」的訊息"
 <at>  <at>  -3093,7 +3139,7  <at>  <at>  msgstr "閒置時間下限（分鐘）"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "閒置時間下限（分鐘）"
 
-#  XXX 不通順
+#  XXX 不通順
 #. *< type
 #. *< ui_requirement
 #. *< flags
 <at>  <at>  -3104,7 +3150,7  <at>  <at>  msgstr "隱藏「加入/離開聊天室ã
 msgid "Join/Part Hiding"
 msgstr "隱藏「加入/離開聊天室」訊息"
 
-#  XXX 不通順
+#  XXX 不通順
 #. *< name
 #. *< version
 #. *  summary
 <at>  <at>  -3117,123 +3163,127  <at>  <at>  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 "日誌目錄"
 
 <at>  <at>  -3243,20 +3293,20  <at>  <at>  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"
 <at>  <at>  -3264,8 +3314,7  <at>  <at>  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"
 "注意：這個模組仍處於開發初期，因此可能經常當掉。如果使用，後果自負！"
 
 <at>  <at>  -3316,18 +3365,14  <at>  <at>  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"
 <at>  <at>  -3338,26 +3383,32  <at>  <at>  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 "否"
 
 <at>  <at>  -3398,9 +3449,7  <at>  <at>  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..."
 <at>  <at>  -3414,7 +3463,7  <at>  <at>  msgstr "離開時停用"
 msgid "Disable when away"
 msgstr "離開時停用"
 
-# FIXME 譯文有待改進 - 20061027
+# FIXME 譯文有待改進 - 20061027
 #: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
 <at>  <at>  -3429,7 +3478,7  <at>  <at>  msgstr "浮現「未卜先知」的交è«
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "信號測試"
 
 <at>  <at>  -3437,8 +3486,8  <at>  <at>  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 "檢查各種信號是否都能正常運作。"
 
 <at>  <at>  -3461,10 +3510,10  <at>  <at>  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
 <at>  <at>  -3472,7 +3521,7  <at>  <at>  msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 <at>  <at>  -3480,8 +3529,8  <at>  <at>  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 的支援。"
 
 <at>  <at>  -3491,7 +3540,7  <at>  <at>  msgstr "透過 GNUTLS 提供 SSL 的支æ
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
 <at>  <at>  -3499,8 +3548,8  <at>  <at>  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 的支援。"
 
 <at>  <at>  -3584,67 +3633,72  <at>  <at>  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 帳號"
 
 <at>  <at>  -3658,113 +3712,114  <at>  <at>  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 "填寫註冊資料欄位。"
 
 <at>  <at>  -3772,306 +3827,311  <at>  <at>  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 "自檔案讀取好友清單..."
 
 <at>  <at>  -4086,38 +4146,38  <at>  <at>  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 "沒有設定主題"
 
 <at>  <at>  -4151,85 +4211,83  <at>  <at>  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
 <at>  <at>  -4244,55 +4302,57  <at>  <at>  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
 <at>  <at>  -4301,8 +4361,8  <at>  <at>  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 "姓名"
 <at>  <at>  -4311,7 +4371,7  <at>  <at>  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"
 
 <at>  <at>  -4319,14 +4379,14  <at>  <at>  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 "被禁止"
 <at>  <at>  -4345,8 +4405,8  <at>  <at>  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 "網名"
 <at>  <at>  -4365,7 +4425,7  <at>  <at>  msgstr "上線自"
 msgid "Online since"
 msgstr "上線自"
 
-#  XXX 其實譯得不太對，可以改進一點
+#  XXX 其實譯得不太對，可以改進一點
 #: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述：</b>"
 <at>  <at>  -4374,13 +4434,13  <at>  <at>  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."
 <at>  <at>  -4449,78 +4509,78  <at>  <at>  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"
 <at>  <at>  -4539,63 +4599,49  <at>  <at>  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."
 <at>  <at>  -4609,23 +4655,20  <at>  <at>  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;：改變你的網名。"
 
 <at>  <at>  -4637,17 +4680,13  <at>  <at>  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"
 <at>  <at>  -4657,31 +4696,25  <at>  <at>  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 指令到伺服器。"
 <at>  <at>  -4690,9 +4723,7  <at>  <at>  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."
 <at>  <at>  -4714,17 +4745,13  <at>  <at>  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."
 <at>  <at>  -4734,108 +4761,103  <at>  <at>  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"
 <at>  <at>  -4854,7 +4876,7  <at>  <at>  msgstr "名"
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
 <at>  <at>  -4885,7 +4907,7  <at>  <at>  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 "國家"
 <at>  <at>  -4913,16 +4935,17  <at>  <at>  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 "描述"
 
 <at>  <at>  -4937,7 +4960,7  <at>  <at>  msgstr "以下所有的欄位都是選æ“
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。你只要輸入你想輸入你想填入的訊息即可。"
 
-# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：Pidgin）
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 <at>  <at>  -4948,190 +4971,185  <at>  <at>  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
 <at>  <at>  -5140,56 +5158,51  <at>  <at>  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"
 <at>  <at>  -5197,19 +5210,19  <at>  <at>  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
 <at>  <at>  -5224,46 +5237,47  <at>  <at>  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
 <at>  <at>  -5271,9 +5285,9  <at>  <at>  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
 <at>  <at>  -5288,151 +5302,146  <at>  <at>  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)："
 <at>  <at>  -5464,13 +5473,13  <at>  <at>  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"
 <at>  <at>  -5489,7 +5498,7  <at>  <at>  msgstr "聊天室設定錯誤"
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
-# XXX 暫譯，譯文有問題，要改善
+# XXX 暫譯，譯文有問題，要改善
 #: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 <at>  <at>  -5499,16 +5508,16  <at>  <at>  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 "讀取聊天室清單時發生錯誤"
 <at>  <at>  -5517,7 +5526,7  <at>  <at>  msgstr "無效的伺服器名"
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
 #: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 <at>  <at>  -5531,30 +5540,25  <at>  <at>  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"
 <at>  <at>  -5563,741 +5567,718  <at>  <at>  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 <at> %s successful"
 msgstr "成功註冊 %s <at> %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 <at> %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 <at> %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: 給好友一個「嗶」引他（她）注意"
 
 <at>  <at>  -6317,36 +6298,36  <at>  <at>  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 "連結伺服器"
 
 <at>  <at>  -6355,74 +6336,68  <at>  <at>  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 時發生錯誤"
 <at>  <at>  -6439,785 +6414,855  <at>  <at>  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 "個人資料網址"
 <at>  <at>  -7232,110 +7277,138  <at>  <at>  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 "
 <at>  <at>  -7352,27 +7425,49  <at>  <at>  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"
 <at>  <at>  -7381,369 +7476,400  <at>  <at>  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
 <at>  <at>  -7751,179 +7877,200  <at>  <at>  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"
 <at>  <at>  -7953,7 +8100,7  <at>  <at>  msgstr "那個目錄已經存在"
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
-#  XXX 這個太奇怪了 (^^;)
+#  XXX 這個太奇怪了 (^^;)
 #: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
 <at>  <at>  -7978,7 +8125,7  <at>  <at>  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 "你的系統管理員不容許這個動作"
 <at>  <at>  -7995,7 +8142,7  <at>  <at>  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 設定錯誤"
 <at>  <at>  -8058,111 +8205,111  <at>  <at>  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"
 
 <at>  <at>  -8172,43 +8319,39  <at>  <at>  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"
 <at>  <at>  -8219,38 +8362,32  <at>  <at>  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 "這個會議已經關閉。無法繼續送出任何訊息。"
 
 <at>  <at>  -8264,33 +8401,33  <at>  <at>  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"
 <at>  <at>  -8299,10 +8436,10  <at>  <at>  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 "連線至伺服器時收到無效的資料。"
 
 <at>  <at>  -8337,42 +8474,49  <at>  <at>  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 "無效錯誤"
 <at>  <at>  -8389,7 +8533,7  <at>  <at>  msgstr "到用戶端速率"
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
-#  XXX 可能是誤譯
+#  XXX 可能是誤譯
 #: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 <at>  <at>  -8426,8 +8570,8  <at>  <at>  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負載過大"
 <at>  <at>  -8436,7 +8580,7  <at>  <at>  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 "本地端的允許／拒絕清單"
 <at>  <at>  -8479,23 +8623,18  <at>  <at>  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 "好友圖示"
 <at>  <at>  -8504,21 +8643,21  <at>  <at>  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 "接收檔案"
 
 <at>  <at>  -8538,7 +8677,7  <at>  <at>  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 使用者"
 <at>  <at>  -8547,7 +8686,7  <at>  <at>  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?
 <at>  <at>  -8574,7 +8713,7  <at>  <at>  msgstr "ICQ UTF8"
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-# NOTE 這似乎是一種掌上電腦的牌子
+# NOTE 這似乎是一種掌上電腦的牌子
 #: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 <at>  <at>  -8583,12 +8722,12  <at>  <at>  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 視像聊天"
 <at>  <at>  -8597,56 +8736,50  <at>  <at>  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 "警告等級"
 
 <at>  <at>  -8685,141 +8818,148  <at>  <at>  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  <at> c OK and  <at> c Cancel buttons.
+#. *
+#. *  <at> 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  <at> c OK and  <at> c Cancel buttons.
+#. *
+#. *  <at> 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 "
 <at>  <at>  -8829,17 +8969,17  <at>  <at>  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"
 <at>  <at>  -8852,7 +8992,7  <at>  <at>  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"
 <at>  <at>  -8865,7 +9005,7  <at>  <at>  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"
 <at>  <at>  -8878,38 +9018,38  <at>  <at>  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."
 <at>  <at>  -8918,22 +9058,22  <at>  <at>  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."
 <at>  <at>  -8941,214 +9081,208  <at>  <at>  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 "
 <at>  <at>  -9159,11 +9293,11  <at>  <at>  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 "
 <at>  <at>  -9174,93 +9308,84  <at>  <at>  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 "
 <at>  <at>  -9270,198 +9395,196  <at>  <at>  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)"
 <at>  <at>  -9469,34 +9592,31  <at>  <at>  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"
 <at>  <at>  -9652,28 +9772,28  <at>  <at>  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 表情"
 
 <at>  <at>  -9691,14 +9811,16  <at>  <at>  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 "連同認證要求的新增好友失敗"
 
 <at>  <at>  -9709,9 +9831,8  <at>  <at>  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
 <at>  <at>  -9740,7 +9861,7  <at>  <at>  msgstr "送出"
 msgstr "送出"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
 msgstr "成功將 %d 加入好友清單"
 
 <at>  <at>  -9777,17 +9898,16  <at>  <at>  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"
 
 <at>  <at>  -9819,31 +9939,30  <at>  <at>  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 "我不是成員"
 
 <at>  <at>  -9868,7 +9987,6  <at>  <at>  msgstr "這羣組不容許外人加入"
 msgstr "這羣組不容許外人加入"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "你成功離開羣組"
 
 <at>  <at>  -9877,19 +9995,16  <at>  <at>  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 ""
 <at>  <at>  -9909,24 +10024,20  <at>  <at>  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 "成功更改了羣的資訊"
 
 <at>  <at>  -9946,132 +10057,123  <at>  <at>  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 "封鎖這個好友"
 
 <at>  <at>  -10085,20 +10187,19  <at>  <at>  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"
 
 <at>  <at>  -10117,19 +10218,18  <at>  <at>  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
 <at>  <at>  -10144,9 +10244,9  <at>  <at>  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
 <at>  <at>  -10154,15 +10254,15  <at>  <at>  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
 <at>  <at>  -10174,280 +10274,272  <at>  <at>  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
 m