merge of '16c4ecfdc5794b9bbc9e365c9c1baade8465d350'

and '3a93a47a038985149c1f53fba5af62cbd2fbe214'
author: Kevin Stange <kstange@pidgin.im> 2007-09-14 04:28:13 +0000
committer: Kevin Stange <kstange@pidgin.im> 2007-09-14 04:28:13 +0000
commit: dd9cf9d404f3d1e9cfa8846aec86985468cf5e5e (patch)
tree: 139ea5c3eaa0c83e325f7bdd17c290342fbf0691
parent: 0c117b0ee61e3b731039041899b6f48c8b16869f (diff)
parent: fbf3e95b754d283d8e29957dcfae8fa0d84d9306 (diff)
download: pidgin-dd9cf9d404f3d1e9cfa8846aec86985468cf5e5e.tar.gz
1 files changed, 4070 insertions, 2779 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2f2e8ade65..7d4aaa828c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.479 2007/07/15 15:13:59 acli Exp $
+# $InternalId: zh_TW.po,v 1.489 2007/09/14 04:05:55 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -46,13 +46,14 @@
 # NOTE 所有語文名稱（除「世界語」外）一概譯成「XX文」，不譯「XX語」，因為寫下的是文，不是語
 # ----------------------------------------------------------
 #
+#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.1.0\n"
-"POT-Creation-Date: 2007-07-15 03:23-0400\n"
-"PO-Revision-Date: 2007-07-13 04:19-0400\n"
-"Last-Translator: Ambrose Li <acli@ada.dhs.org>, Paladin R. Liu <paladin@ms1."
-"hinet.net>\n"
+"Project-Id-Version: Pidgin 2.2.0\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
+"PO-Revision-Date: 2007-09-13 14:52+0800\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
+"<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,17 +64,17 @@ msgstr ""
 #  NOTE Untranslated
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -95,7 +96,7 @@ msgstr ""
 "  -v, --version       顯示版本訊息並離開\n"
 
 #  NOTE 第二、三個 %s 係目錄名稱（不是程式名）
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -105,15 +106,18 @@ msgstr ""
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤，請調查後改以人手完成轉移程序，"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
@@ -127,86 +131,90 @@ msgstr "帳號未被新增"
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
 msgid "There's no protocol plugins installed."
 msgstr "未有安裝任何協定模組。"
 
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
 msgid "(You probably forgot to 'make install'.)"
 msgstr "（大概是忘記了執行「make install」了。）"
 
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
 msgid "Modify Account"
 msgstr "修改帳號"
 
 # XXX check
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "帳號："
 
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
 msgid "Password:"
 msgstr "密碼："
 
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
 msgid "Alias:"
 msgstr "別名："
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../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:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
 #: ../libpurple/protocols/qq/group_opt.c:144
 #: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../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
@@ -229,110 +237,113 @@ msgstr "別名："
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
 #: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 #: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
 #: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s？"
 
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
 msgid "Delete Account"
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2104 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他（她）的好友 %s%s"
 
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號，或帳號括弧別名（第二、四個 %s 是括弧）
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」，基本上可以不理會（也不能怎樣理會）
-#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他（她）的好友清單%s%s。"
 
-#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
 #: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "給予認證？"
 
-#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
 #: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
 #: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "拒絕"
@@ -357,36 +368,36 @@ msgstr "所指定的帳號目前沒有連線。"
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1392
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -395,7 +406,7 @@ msgstr "帳號"
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
@@ -405,15 +416,16 @@ msgstr "新增好友"
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -421,161 +433,166 @@ msgstr "聊天"
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "自動加入"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節，請用快顯選單。"
 
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實：是「加入」抑或「新增」?
-#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "自動加入"
-
 # XXX 還是「修改選項」？
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱，請輸入空白字串。"
 
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s？"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
 #: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
 # NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -585,29 +602,29 @@ msgstr "切換標記"
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1333
 msgid "On Mobile"
 msgstr "使用行動裝置中"
 
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1414
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -616,12 +633,12 @@ msgstr ""
 "上線：%d 人\n"
 "總數：%d 人"
 
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1423
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號：%s (%s)"
 
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1435
 #, c-format
 msgid ""
 "\n"
@@ -631,51 +648,55 @@ msgstr ""
 "<b>最後見到：</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文，指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」（新增一個狀態），彈出的視窗也有「新增」，可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../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:6077
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -692,43 +713,161 @@ msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2246
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2250
 msgid "Show empty groups"
 msgstr "顯示空的好的群組"
 
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2256
 msgid "Show offline buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2262
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2266
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2270
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "匯入憑證"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "請指定主機名稱"
+
+# XXX 譯文有待改進 - acli 20070913
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "請輸入這張憑證所屬的主機名稱。"
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"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:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "憑證匯入錯誤"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509 憑證匯入失敗"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "選擇PEM憑證"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"無法匯出至檔案「%s」。\n"
+"請確定您有權限寫入目標檔\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "憑證匯出錯誤"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509 憑證匯出失敗"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "匯出 X.509 憑證"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s 的憑證"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"全名：%s\n"
+"\n"
+"SHA1 指紋：\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL 主機憑證"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "確定要刪除 %s 的憑證？"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "確定刪除憑證"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "憑證管理"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../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:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "資訊"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../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:272
+msgid "Close"
+msgstr "關閉"
+
 #: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
@@ -751,42 +890,46 @@ msgstr ""
 "\n"
 "在您更正這個錯誤並重新啟動這個帳號前，Finch 將不會再試著重新連線。"
 
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤：輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗，原因不明。"
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效，在即時訊息中無效。"
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效，在聊天室內無效。"
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "因為您並未登入，所以訊息無法送出："
+
 # XXX 這是什麼？
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:231
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
 #, c-format
 msgid ""
 "\n"
@@ -795,48 +938,65 @@ msgstr ""
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
 msgid "You have left this chat."
 msgstr "您離開了聊天室。"
 
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
+
+#: ../finch/gntconv.c:419
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "開始記錄日誌"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "啟動音效"
+
+#: ../finch/gntconv.c:713
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
 msgid "List of users:\n"
 msgstr "使用者列表：\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有：version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
 msgid "No such command (in this context)."
 msgstr "沒有這個指令（可在這裏使用）"
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -844,60 +1004,60 @@ msgstr ""
 "要獲得某一指令的說明，輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏，可用的指令有：\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;：將指定的訊息當成一般訊息正常送出，而非當為指令處理。"
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;：模仿IRC，執行一個動作。"
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;：向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear：清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;：顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
 msgid "users:  Show the list of users in the chat."
 msgstr "users：顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
 msgid "plugins: Show the plugins window."
 msgstr "plugins：顯示「模組」視窗"
 
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist：顯示好友清單。"
 
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
 msgid "accounts: Show the accounts window."
 msgstr "accounts：顯示帳號清單。"
 
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
 msgid "debugwin: Show the debug window."
 msgstr "debugwin：顯示除錯視窗"
 
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
 msgid "prefs: Show the preference window."
 msgstr "prefs：顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses：「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -923,101 +1083,97 @@ msgid "File Transfers - %d%% of %d files"
 msgstr "檔案傳輸：%2$d 個檔案完成了 %1$d%%"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
 #: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "進度"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "檔名"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "大小"
 
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
 #: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "狀態"
 
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
 msgid "Close this window when all transfers finish"
 msgstr "所有的檔案傳輸完畢時，關閉這個視窗"
 
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
 msgid "Clear finished transfers"
 msgstr "清除已完成的傳輸"
 
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
 msgid "Stop"
 msgstr "中止"
 
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "關閉"
-
 #  XXX 暫譯
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "已取消"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "失敗"
 
 #  XXX pending Paladin's confirmation - acli 20070713
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "成功存檔至 %s。"
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
 #: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -1030,11 +1186,11 @@ msgstr "電子郵件"
 msgid "You have mail!"
 msgstr "您收到郵件！"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
 msgid "Subject"
 msgstr "主題"
 
@@ -1045,32 +1201,25 @@ msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
 #: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:909
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "繼續"
 
-# XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
-# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-# XXX 注：現在 (2.0.0b4) 不是了，除錯視窗的「過濾程度」竟有「Info」（資訊）級別……
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "資訊"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
 msgid "IM"
 msgstr "即時訊息"
 
@@ -1138,7 +1287,7 @@ msgstr "設定模組"
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -1146,7 +1295,6 @@ msgstr "偏好設定"
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#. Create the window.
 #: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
@@ -1160,7 +1308,7 @@ msgid "Pounce Who"
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
 msgid "Account:"
 msgstr "帳號："
 
@@ -1169,7 +1317,7 @@ msgid "Buddy name:"
 msgstr "好友名稱："
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
@@ -1214,7 +1362,7 @@ msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
 msgid "Action"
 msgstr "執行動作"
 
@@ -1242,72 +1390,84 @@ msgstr "播放音效"
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "無法新增好友狀態捕捉"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "未有設定任何帳號"
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "新增好友狀態捕捉前，必須先新增一個帳號。"
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉？"
 
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
 #, 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:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
@@ -1315,13 +1475,13 @@ msgstr "未知的捕捉事件。請回報這個問題！"
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
 #: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
 
@@ -1370,12 +1530,12 @@ msgid "Change status to"
 msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
 msgid "Logging"
 msgstr "日誌"
 
@@ -1383,16 +1543,167 @@ msgstr "日誌"
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "開啟檔案..."
 
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "好友登入"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "好友登出"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "收到訊息"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "訊息收到，開始進行交談"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "訊息送出"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "有人進入聊天室"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "有人離開聊天室"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "您在聊天室說話"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "其他人進入聊天室"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "有人在聊天室中提到您的名字"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer 錯誤"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 初始化失敗。"
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(預設)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "選擇音效檔..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "音效設定"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "個人資料"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "自動"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "嗶一聲"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "指令"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "無音效"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "音效播放方式"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "播放方式："
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"音效指令：\n"
+"(請以 %s 代表檔名)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "音效選項"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "當交談取得輸入焦點發出音效"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../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:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "上線而非離開期間"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "離開期間"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "音量(0-100)："
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "事件音效"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "事件"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "檔案"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "測試"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "重置"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "選擇..."
+
 #: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
@@ -1408,9 +1719,9 @@ msgid "Saved Statuses"
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義，根本無法翻譯
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
 #: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
@@ -1421,30 +1732,39 @@ msgstr "職銜"
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../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:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../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:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1452,15 +1772,15 @@ msgstr "格式"
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
 #: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
 msgid "Use"
 msgstr "使用"
 
@@ -1472,53 +1792,79 @@ msgstr "標題無效"
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態："
 
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
 msgid "Message:"
 msgstr "訊息："
 
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "憑證"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "音效"
+
+#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "狀態"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "載入模組途中遭遇錯誤。"
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "找不到 X Display 的設定"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "無法開啟檔案"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "無法載入模組，因為建置模組時沒有給它加入 X11 支援。"
+
+#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "剪貼簿模組"
 
 #  FIXME: 這很不通順
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1641,71 +1987,72 @@ msgstr ""
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
 msgid "New password (again)"
 msgstr "新密碼（再次確認）"
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1716,19 +2063,20 @@ msgstr "設定使用者資訊"
 # XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態，可能是指「不明」（通訊系統回報的狀態是「不明」）
 # XXX                       或者「未知」（出現了 Pidgin 未見過的狀態代號）
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "好友"
 
@@ -1736,22 +2084,184 @@ msgstr "好友"
 msgid "buddy list"
 msgstr "好友清單"
 
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "（並不相符）"
+
+#  XXX 這是暫譯 - acli 20070913
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s 出示了以下隨用即棄的憑證："
+
+#: ../libpurple/certificate.c:550
+#, 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
+msgid "Single-use Certificate Verification"
+msgstr "核實即棄憑證"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "憑證機構"
+
+#  TODO Untranslated - acli 20070913
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL Peer 快取"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "接受 %s 的憑證嗎？"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "核實 SSL 憑證"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "接受"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "檢視憑證(_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
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"「%s」出示的憑證聲稱它應該屬於「%s」，您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "「%s」出示的憑證是自簽的，無法自動進行核實。"
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+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
+msgid "SSL Certificate Error"
+msgstr "SSL 憑證錯誤"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "無效的憑證鏈"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"「%s」出示的憑證鍊聲稱它是由某憑證機構簽發，但實際上卻沒有該憑證機構的有效簽"
+"章。"
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "憑證機構的簽章是無效的"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"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:1891
+msgid "Certificate Information"
+msgstr "憑證資訊"
+
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "未註冊錯誤"
+
+#: ../libpurple/connection.c:349
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 登入"
 
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
@@ -1770,45 +2280,45 @@ msgstr "無法送出訊息給 %s。"
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
@@ -2184,15 +2694,15 @@ msgstr "純文字"
 msgid "Old flat format"
 msgstr "舊式平面檔案"
 
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "無法記錄這個交談。"
 
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2201,7 +2711,7 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2211,16 +2721,16 @@ msgstr ""
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案！</b></font>"
 
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>：%s\n"
@@ -2310,13 +2820,13 @@ 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:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2374,8 +2884,8 @@ msgstr ""
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "（只發生在未與傳送者進行交談的情況下）"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Notes"
 msgstr "備註"
 
@@ -2395,18 +2905,18 @@ msgstr "編輯備註..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "好友備註"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "給個別好友加上備註。"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "提供給好友清單上的好友加上備註的功能。"
 
@@ -2609,44 +3119,44 @@ msgstr ""
 #. * 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:492
+#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "自動回應送出："
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前是離線狀態。在您重新登入前，將無法收到任何訊息。"
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限，所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -2654,68 +3164,68 @@ msgstr "訊息無法送出。"
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 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:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等（後兩者似乎只限用於數學）
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則；單從字義判斷，合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -2725,20 +3235,20 @@ msgstr "日誌目錄"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進（第二段） - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2802,7 +3312,7 @@ msgstr ""
 "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要，訊息可在「好友狀態捕捉」"
 "的對話視窗中編輯或刪除。"
 
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2811,17 +3321,17 @@ msgstr ""
 "「%s」目前為離線，您要使用「好友狀態捕捉」功能儲存未能送出的訊息嗎？（儲存的"
 "訊息將在「%s」下次登入時自動送出）"
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1917
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2831,9 +3341,9 @@ msgstr "您可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀
 msgid "Yes"
 msgstr "是"
 
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
 #: ../libpurple/protocols/novell/novell.c:1918
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2843,11 +3353,11 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "使用「好友狀態捕捉」儲存離線訊息"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問，務必使用「好友狀態捕捉」儲存離線訊息。"
 
@@ -2911,7 +3421,7 @@ msgstr "浮現「未卜先知」的交談"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -2919,8 +3429,8 @@ msgstr "信號測試"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -2942,23 +3452,30 @@ msgstr "簡易模組"
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
 #. *< type
 #. *< ui_requirement
@@ -2966,18 +3483,18 @@ msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "透過 GNUTLS 提供 SSL 的支援。"
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
 #. *< type
 #. *< ui_requirement
@@ -2985,18 +3502,17 @@ msgstr "透過 GNUTLS 提供 SSL 的支援。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
+#: ../libpurple/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
@@ -3086,25 +3602,43 @@ msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎？"
 
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "離開"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
+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:948
+msgid "Last name"
+msgstr "姓"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM 帳號"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP 帳號"
 
 #. *< type
 #. *< ui_requirement
@@ -3116,42 +3650,20 @@ msgstr "離開"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
 #  XXX 這原文很奇怪 - ambrose 20070414
 #  NOTE 對應 evolution PO 檔之譯法，詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "連絡人"
 
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "主機名稱"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "名"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "姓"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3159,43 +3671,35 @@ msgstr "姓"
 msgid "E-mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM 帳號"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP 帳號"
-
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息，交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:591
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
@@ -3272,269 +3776,293 @@ msgstr "新的 Gadu-Gadu 帳號已註冊"
 msgid "Registration completed successfully!"
 msgstr "註冊成功！"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "密碼（再次輸入）"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "男"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "您目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功！"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入您的舊密碼及你的新密碼："
 
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友；%s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../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/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../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:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "離開"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對，要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N)："
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3549,16 +4077,16 @@ msgstr "自檔案讀取好友清單..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
@@ -3615,7 +4143,8 @@ msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -3629,7 +4158,7 @@ msgid "_Channel:"
 msgstr "頻道(_C)："
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "密碼(_P)："
 
@@ -3637,71 +4166,64 @@ msgstr "密碼(_P)："
 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:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
 #: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "連線中"
 
 # XXX 暫譯
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
 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:1586
+#: ../libpurple/protocols/simple/simple.c:1592
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-# FIXME ambiguous - 20061025
-# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "無法連線至認證所需的遠端資源"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL 交談失敗"
-
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
 #: ../libpurple/protocols/sametime/sametime.c:3374
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "主題"
 
@@ -3713,34 +4235,34 @@ msgstr "主題"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1856
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
 #: ../libpurple/protocols/silc10/silc.c:1861
@@ -3748,12 +4270,13 @@ msgstr "伺服器"
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -3769,7 +4292,7 @@ msgstr "編碼"
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3779,7 +4302,7 @@ msgstr "姓名"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -3813,7 +4336,7 @@ msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3693
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4093,7 +4616,7 @@ msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]：列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:2254
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;：改變您的暱稱。"
 
@@ -4222,6 +4745,22 @@ msgstr "CTCP PING 回答"
 msgid "Disconnected."
 msgstr "停止連線。"
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr ""
+
 #: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援。"
@@ -4230,248 +4769,520 @@ msgstr "登入這個伺服器需要使用 TLS/SSL，但找不到 TLS/SSL 支援�
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證？"
 
 # XXX 好像有些怪，譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:769
 #: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "名"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "街道地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "市／村"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "電子郵件"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "職責"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
 msgid "Birthday"
 msgstr "生日"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
 #: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "編輯 XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式（例：gaim）
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "作業系統"
 
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "服務探尋資訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "地址(續)"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "這個使用者沒有他的相關資訊。"
+
+# 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 "帶內位元組串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "指令"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub 服務"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 位元組串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "帶外數據"
+
+#  NOTE Untranslated
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "註冊錯誤"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "使用者所在位置"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "使用者化身"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "好友狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "軟體版本"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "開始串流"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "檔案傳輸"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "使用者情緒"
+
+# XXX may be wrong
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "使用者數目上限"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "相容性"
+
+#  FIXME 這聽來不對 - acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "加密工作階段協商"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "使用者"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "要交換密鑰之即時訊息"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "電子郵件"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "使用者資料"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle 音訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "使用者暱稱"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle 視訊"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "收到的訊息"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "發佈公鑰"
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "使用者瀏覽"
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr ""
+
+# NOTE Jabber 新功能規格
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Trillian 加密"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+#  XXX 暫譯- acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "延遲送出"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "簡化加密工作階段協商"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "相容性"
+
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串，
 # NOTE 用以表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」，芬蘭文譯「其他名」，日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」，現套用，也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4480,43 +5291,51 @@ msgstr "要求或重新要求認證"
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "登入"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "登出"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
 #: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4524,44 +5343,44 @@ msgstr ""
 "請在適用欄位填寫搜尋條件，以便搜尋想找的聯絡人。注意：所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
 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:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令：%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../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
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4569,25 +5388,25 @@ msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
@@ -4686,25 +5505,29 @@ msgid "Find Rooms"
 msgstr "尋找聊天室"
 
 # XXX 譯文有待改進
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "您指定必須加密，但這伺服器沒有加密功能。"
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:483
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4713,55 +5536,70 @@ msgstr ""
 "無法與伺服器建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效，域名是必須設定的。"
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "成功註冊 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "未知錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "成功移除 %s 的註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "移除註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "移除註冊失敗"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "State"
 msgstr "省／州"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -4771,43 +5609,80 @@ msgstr "郵遞區號"
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "移除註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "請填寫以下資料以更新您的註冊資料。"
+
+#: ../libpurple/protocols/jabber/jabber.c:998
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "變更 %s 上的註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "註冊在 %s 的新帳號"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "變更註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "移除帳號註冊錯誤"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "移除帳號註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS 初始中"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4816,91 +5691,198 @@ msgstr "未認證"
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
 # FIXME 原文一詞兩義，根本無法翻譯
 #  NOTE gntnotify 字義為「發信人」
 #  NOTE Jabber 術語字義見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "From"
 msgstr "已認證對方"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語，見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
 #: ../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:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "心情"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "描述情緒"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "樂手名稱"
+
+#: ../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
+msgid "Tune Title"
+msgstr "樂曲名稱"
+
+#: ../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
+msgid "Tune Album"
+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
+msgid "Tune Genre"
+msgstr "樂曲種類"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Comment"
+msgstr "好友說明"
+
+# NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
+# 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
+msgid "Tune Track"
+msgstr "樂曲 ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "樂曲長度"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+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
+msgid "Tune URL"
+msgstr "樂曲網址"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "允許"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Password (again)"
 msgstr "舊密碼（再次確認）"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4908,52 +5890,52 @@ msgstr "傳送網址時發生了不明的錯誤"
 #  NOTE（大概係指登入用的使用者自定字串）或工作階段登入，以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
 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:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Item Not Found"
 msgstr "項目未找到"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
 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:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4961,78 +5943,78 @@ msgstr "必須付款"
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
 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:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
 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:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5042,11 +6024,11 @@ msgstr "無效的 Namespace Prefix"
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種，即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
@@ -5054,170 +6036,191 @@ msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種，即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
 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:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
 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:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
 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:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
 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:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
 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:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
 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:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
 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:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
 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:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
 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:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
 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:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:2045
 #, 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:1690
+#: ../libpurple/protocols/jabber/jabber.c:2065
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:2070
 #, 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:1714
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份：「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:2147
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "無法 Ping 使用者 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
 msgid "config:  Configure a chat room."
 msgstr "config：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:2250
 msgid "configure:  Configure a chat room."
 msgstr "configure：設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:2259
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]：離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:2264
 msgid "register:  Register with a chat room."
 msgstr "register：加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2270
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]：檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2276
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]：禁止某使用者進入聊天室"
 
 #  XXX 暫譯「（會員）等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2282
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5226,7 +6229,7 @@ msgstr ""
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2288
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5234,23 +6237,32 @@ msgstr ""
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2294
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]：邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]：加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2306
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]：將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2311
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使用者"
 
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 給好友一個「嗶」引他（她）注意"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5261,125 +6273,139 @@ msgstr "msg &lt;使用者&gt; &lt;訊息&gt;：傳送私人訊息給另一個使
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "域名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "需要 SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文，在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
 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:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s 已經離開這個交談。"
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為：%s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題：%s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s：%s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/jabber/message.c:404
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室，您要設定它，還是使用預設值？"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s，因為對方不支援檔案傳輸"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "無法送出訊息給 %s，因為這個 JID 是無效的"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "無法傳送檔案至 %s，因為對方目前沒有連線"
@@ -5387,21 +6413,67 @@ msgstr "無法傳送檔案至 %s，因為對方目前沒有連線"
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文，但這是這個 PO 檔現有的譯法（見「To」條）；
 #  FIXME 如果這個要改，其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "無法傳送檔案至 %s，因為未獲對方認證"
 
 #  FIXME 這不通順 - acli 20070614
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
 msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "編輯使用者情緒"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "設定"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "設定情緒..."
+
+#  XXX may be wrong
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "設定使用者暱稱"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "請為您自己設定新的暱稱。"
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "設定暱稱..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "動作"
+
+#  XXX 要覆查
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "選擇一個動作"
+
 # XXX 暫譯
 #: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
@@ -5625,7 +6697,7 @@ msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5665,42 +6737,52 @@ msgstr "未知的錯誤代碼 %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "您剛送出了一個呼叫！"
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s 呼叫您！"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求／問題
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5708,321 +6790,323 @@ msgstr ""
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
 msgid "Has you"
 msgstr "你在他（她）的好友清單裏"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
 #: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Music"
 msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
 msgid "Home Address"
 msgstr "住家地址"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Personal Mobile"
 msgstr "個人行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Mobile"
 msgstr "商務行動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Pager"
 msgstr "商務呼叫器"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
 #: ../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:1828
+#: ../libpurple/protocols/msn/msn.c:1856
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
 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 "
@@ -6031,15 +7115,15 @@ msgstr ""
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在；亦有可能使"
 "用者存在，但沒有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
 "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "個人資料網址"
 
@@ -6053,19 +7137,19 @@ msgstr "個人資料網址"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：呼叫使用者，引起他們的注意"
 
@@ -6084,8 +7168,8 @@ msgstr "nudge：呼叫使用者，引起他們的注意"
 #: ../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:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -6206,8 +7290,8 @@ msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
@@ -6230,10 +7314,11 @@ msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單，請過一會後重試。"
 
+# See cnscode.org.tw
 #: ../libpurple/protocols/msn/session.c:346
 #: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
-msgstr "交談中"
+msgstr "交握中"
 
 #: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
@@ -6300,30 +7385,430 @@ msgstr "因為 Switchboard 發生錯誤，所以訊息無法送出"
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤，訊息可能沒有送出："
 
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s 在呼叫您！"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 將您加入他（她）的好友清單。"
 
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將您從他（她）的好友清單中移除。"
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的帳號無效。"
 
+# XXX 暫譯 - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "欠缺需要的加密方法"
+
+# XXX 暫譯 - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+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 ""
+"無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple（即 2.0.1 版為以"
+"上）。"
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr "MySpace 恕不支援長於 %d 個字元的密碼，而您的密碼已是 %d 個字元長。"
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM 錯誤"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "讀取驗證挑戰中"
+
+# XXX 好像有些怪，譯文有待改進
+#: ../libpurple/protocols/myspace/myspace.c:354
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "伺服器送來的驗證挑戰有意料之外的長度"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "登入中"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "與伺服器失去連線（%d 秒內收不到任何數據）"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "有新郵件"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "網誌有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "個人資料網頁有新留言"
+
+#  FIXME 譯文很不通順 - acli 20070913
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "有新的交友要求！"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "相片集有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+# 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:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "已連結"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "未有設定使用者名稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選"
+"擇一個使用者名稱後，再嘗試重新登入。"
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "通訊協定錯誤，代碼 %d：%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "無法新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "「addbuddy」指令失敗。"
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "「persist」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "無此使用者：%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "搜尋使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "無法移除使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "「delbuddy」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "「blocklist」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "完成連線"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "讀取用的暫存區滿了"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "無法解析訊息"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "無法連到伺服器：%s (%d)"
+
+#  NOTE 這是群組名稱
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "即時訊息的好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "從伺服器新增或更新了 %d 個好友（包括已在好友清單上的好友）"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "從伺服器加入聯絡人"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "從 MySpace.com 新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "匯入好友失敗"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "尋找好友..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "變更即時通訊名稱..."
+
+#  NOTE 這似乎是視窗標題
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim 網址處理器"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "在狀態列顯示暱稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "在狀態列顯示標題"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "傳送表情圖示"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "熒幕解像度（DPI）"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "基礎字體大小(點)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "使用者"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "個人資料"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "頭條消息"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "歌曲"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "好友總數"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "客戶端版本"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "電"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "Zapping %s..."
+msgstr "呼叫 %s"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "摑"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "摑 %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "主題"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "該使用者拒絕了您"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "燒 %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "親吻"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s 已經登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "親吻 %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "擁抱"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s 已經登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "擁抱 %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "斯洛伐克文"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "掐屁股"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s 掐了您的屁股！"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "掐 %s 的屁股中..."
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s high-five 了您！"
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "High-five %s 中..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s 已經登入。"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
@@ -6675,18 +8160,18 @@ msgstr "伺服器位址"
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
 #: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
@@ -6697,7 +8182,7 @@ msgstr ""
 "與伺服器之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
 #: ../libpurple/proxy.c:1461
@@ -6735,7 +8220,7 @@ msgid "ICQ Protocol Plugin"
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
@@ -6765,7 +8250,7 @@ msgstr "無法與遠端使用者建立連線。"
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s，超過了 %s 這個上限。"
@@ -6871,7 +8356,7 @@ msgstr "佇列滿了"
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -6882,7 +8367,7 @@ msgstr ""
 "編碼；如果您知道那是什麼編碼，請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。）"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6892,22 +8377,22 @@ msgstr ""
 "用有問題的用戶端程式。）"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6915,33 +8400,33 @@ msgstr "AIM 式即時訊息"
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
 # NOTE 據其他PO檔的譯文看，「AP」應該不是「應用程式」
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "AP User"
 msgstr "AP 使用者"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6952,100 +8437,101 @@ msgstr "ICQ RTF"
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA，即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -7054,7 +8540,7 @@ msgstr ""
 "無法連線至認證伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -7063,20 +8549,20 @@ msgstr ""
 "無法連線到 BOS 伺服器：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7086,31 +8572,31 @@ msgstr ""
 "無法登入：無法以 %s 身份登入，因為這個帳號是無效的。帳號必須為有效電郵地址；"
 "或者以英文字母起始，並只含英文字母、數字及空白；或者只由數字組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
 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."
@@ -7118,44 +8604,44 @@ msgstr ""
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../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:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../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 "
@@ -7164,53 +8650,53 @@ msgstr ""
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../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:1627
+#: ../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:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2195
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2223
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2224
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2272
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2400
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7220,17 +8706,17 @@ msgstr ""
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2401
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2408
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7243,7 +8729,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7256,7 +8742,7 @@ msgstr ""
 "來自：%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2432
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7269,38 +8755,38 @@ msgstr ""
 "訊息為：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2453
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2459
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2465
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2589
 #, 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:2581
+#: ../libpurple/protocols/oscar/oscar.c:2598
 #, 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:2590
+#: ../libpurple/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7310,21 +8796,21 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感，直譯「邪惡」好像行不通，下同
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2616
 #, 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:2608
+#: ../libpurple/protocols/oscar/oscar.c:2625
 #, 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:2617
+#: ../libpurple/protocols/oscar/oscar.c:2634
 #, 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."
@@ -7332,63 +8818,55 @@ msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2792
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s："
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2858
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊：%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2889
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
-msgid "Capabilities"
-msgstr "相容性"
-
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2929
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
-msgid "Profile"
-msgstr "個人資料"
-
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3037
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3225
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息，因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3389
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7396,114 +8874,110 @@ msgstr ""
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "您因為不明原因而登出。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3752
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3776
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3809
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3870
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3910
 #, 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:3936
+#: ../libpurple/protocols/oscar/oscar.c:3915
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3941
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:3964
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3995
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, 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:4022
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, 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:4028
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, 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:4031
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7511,37 +8985,37 @@ msgid ""
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, 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:4037
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4028
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4211
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像；要傳送即時訊息影像，必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4483
 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 "
@@ -7550,7 +9024,7 @@ msgstr ""
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4497
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7561,11 +9035,11 @@ msgid_plural ""
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4502
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4547
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7576,11 +9050,11 @@ msgid_plural ""
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限，過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4552
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4621
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7591,9 +9065,9 @@ msgstr ""
 "效電郵地址；或者必須以英文字母為開頭，同時由「英文字母」、「數字」和「空白」"
 "所組成，或者單純以「數字」組成。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "無法加入"
 
@@ -7609,16 +9083,15 @@ msgstr ""
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失，可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
 #: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5054
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7627,17 +9100,17 @@ msgstr ""
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單，原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5162
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7647,23 +9120,23 @@ msgstr ""
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 #, 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:5239
+#: ../libpurple/protocols/oscar/oscar.c:5244
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5247
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7673,32 +9146,32 @@ msgstr ""
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5248
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同，暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5284
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E)："
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5324
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像；AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
 #: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對，又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7706,90 +9179,90 @@ msgstr " <i>(搜尋中)</i>"
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
 #  XXX 所以這應該是有問題的譯文，但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5758
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5866
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5867
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5914
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5918
 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:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5959
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5965
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5973
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6008
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」，不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6067
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態（會導致您收到垃圾訊息！）"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6075
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6094
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6095
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6148
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6197
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7797,74 +9270,74 @@ msgstr ""
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6216
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6217
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6378
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6389
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6393
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6403
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6410
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6414
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6418
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6425
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6504
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Show how long you have been idle"
 msgstr "顯示您閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6662
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7872,26 +9345,26 @@ msgstr ""
 "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
 "（較慢，但不會暴露您的 IP 位址）"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu)，以便建立即時訊息。"
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s；%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8086,7 +9559,6 @@ msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "請輸入原因："
 
@@ -8103,39 +9575,33 @@ msgstr "拒絕"
 msgid "Sorry, you are not my type..."
 msgstr "對不起，我和你，合不來的……"
 
-#: ../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:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "拒絕"
-
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "您成功從一個好友的好友清單中移除了您自己"
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "您成功從對方的好友清單中移除了您自己"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎？"
@@ -8143,22 +9609,22 @@ msgstr "想同我交個朋友嗎？"
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
 #: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "送出"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
-msgid "You have added %d in buddy list"
+msgid "You have added %d to buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
@@ -8187,7 +9653,7 @@ msgid "QQ Qun"
 msgstr "QQ 群"
 
 #: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
 msgstr "請輸入外部 Group ID"
 
 # NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
@@ -8197,12 +9663,12 @@ msgstr "您只可搜尋永久群組\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "原因：%s"
@@ -8222,37 +9688,37 @@ msgstr "QQ 群組操作"
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "允許"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr "管理人 %d 拒絕了您加入群組 %d"
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr "管理人 %2$d 拒絕了您加入群組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr "管理人 %d 允許了您加入群組 %d"
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr "管理人 %2$d 允許了您加入群組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "群組「%2$d」新增了您 [%1$d]"
+msgid "You [%d] have been added to group \"%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
-msgid "I am not member"
+msgid "I am not a member"
 msgstr "我不是成員"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
@@ -8276,7 +9742,7 @@ msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
 msgstr "您成功離開群組"
 
 #: ../libpurple/protocols/qq/group_join.c:257
@@ -8284,16 +9750,16 @@ msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
+msgid "Your authorization request has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "您確定要離開這個群 (Qun) 嗎？"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "您確定要離開群組？"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -8301,10 +9767,6 @@ msgid ""
 "this operation will eventually remove this Qun."
 msgstr "請注意，假如您是創立者，這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "確定"
-
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
@@ -8314,20 +9776,24 @@ msgstr "代碼 0x%02X：%s"
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#. we wanna see window
+#. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
 msgstr "允許這個要求？"
 
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "請輸入原因："
+
 #  NOTE QQ「member」應是「成員」
 #: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
 #: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
 msgstr "成功更改了群的資訊"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
@@ -8347,20 +9813,18 @@ msgid "System Message"
 msgstr "系統訊息"
 
 #: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "伺服器回應"
-
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "送出即時訊息失敗。"
 
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
 #: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
+#, fuzzy
+msgid "Keep alive error"
+msgstr "讀取錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "「登入要求」Token 出現錯誤"
+msgid "Error requesting login token"
+msgstr "取得 Login Token 錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
@@ -8386,101 +9850,87 @@ msgstr "無法連結。"
 msgid "Unknown-%d"
 msgstr "未知（代碼 %d）"
 
-#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s 位址"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP 位址"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP 位址"
 
 #  FIXME 這是暫譯，但在有限的資料下（我沒有QQ帳戶）應該是大致正確的譯法 - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "成長階段"
 
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: 上線"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: 離開"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: 隱身"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: 離線"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "名稱無效"
 
 #  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>：%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
 #, 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:444
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址：</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間：</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "修改資訊"
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "設定我的資訊"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "顯示登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "封鎖這個好友"
 
@@ -8494,26 +9944,13 @@ msgstr "封鎖這個好友"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "以 TCP 登入"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "以隱藏狀態登入"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "寫入 Socket 途中發生錯誤"
-
-# XXX - 20061027
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "連線被拒"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "使用 TCP 連結"
 
 #: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
@@ -8542,62 +9979,59 @@ msgstr "%d 取消了「%s」的傳送"
 msgid "Connection lost"
 msgstr "連線中斷"
 
+# FIXME 譯文有待改進  - 20070912 acli
 #. cancel login progress
 #: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "登入失敗，沒有回應"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "您想將這個使用者加入到您的好友名單中嗎？"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "您要加入這個使用者到好友清單中嗎？"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
-msgstr "您想將他（她）加入到您的好友清單嗎？"
+# FIXME fix the original string :P
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
+msgstr "您要將他（她）加入您的好友清單嗎？"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
-msgid "%s has added you [%s]"
-msgstr "%s 已將您 [%s] 加入到他（她）的好友清單"
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s 將您 [%s] 加入他（她）的好友清單。"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
-msgid "User %s has approved your request"
-msgstr "使用者「%s」允許了您的要求"
+msgid "User %s approved your request"
+msgstr "使用者 %s 允許了您的要求"
 
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s 想要將您（%s）加入他（她）的好友清單"
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s 想要將您 [%s] 加入他（她）的好友清單"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "訊息：%s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
-# FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "您要將他（她）加入您的好友清單嗎？"
-
 #: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "連線關閉（寫入）"
@@ -8629,17 +10063,21 @@ msgstr "邀請整個群組進入會議室..."
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
+# NOTE 見cnscode.org.tw
+# FIXME 譯文有待改進
 #: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
-msgstr "傳送 Handshake"
+msgstr "傳送交握中"
 
+# NOTE 見cnscode.org.tw
 #: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "等待 Handshake 回應"
+msgstr "等待交握回應"
 
+# NOTE 見cnscode.org.tw
 #: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Handshake收到回應，送出登入要求"
+msgstr "收到交握回應，送出登入要求中"
 
 #: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
@@ -8647,11 +10085,11 @@ msgstr "等待登入要求的回應"
 
 #: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
-msgstr "重新導向登入"
+msgstr "登入已被重新導向"
 
 #: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr "強行登入"
+msgstr "強行登入中"
 
 #: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
@@ -8662,11 +10100,6 @@ msgstr "登入要求收到回應"
 msgid "Starting Services"
 msgstr "啟動服務"
 
-# TODO 要覆查 - 20061027
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "已連結"
-
 #: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
@@ -8723,10 +10156,6 @@ msgstr "喇叭"
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "檔案傳輸"
-
 #: ../libpurple/protocols/sametime/sametime.c:3269
 #: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
@@ -8794,7 +10223,7 @@ msgstr "邀請進入會議室"
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
 msgid "Topic:"
 msgstr "主題："
 
@@ -8821,7 +10250,7 @@ msgstr "Meanwhile 連線設定"
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
 msgid "Connect"
 msgstr "連線"
 
@@ -8997,8 +10426,7 @@ msgstr ""
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐，把他（她）們新增至好友清"
 "單內，或向他（她）們發出訊息。"
 
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
 msgid "Search Results"
 msgstr "搜尋結果"
 
@@ -9437,13 +10865,6 @@ msgstr "憂慮"
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "心情"
-
 #: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1224
 #: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9978,7 +11399,7 @@ msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "姓名"
 
@@ -10113,13 +11534,6 @@ msgid "Network Statistics"
 msgstr "網路統計資料"
 
 #: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
@@ -10273,7 +11687,7 @@ msgid "Your Current Mood"
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
 msgid "Normal"
 msgstr "正常"
 
@@ -10666,7 +12080,7 @@ msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
 msgid "Network"
 msgstr "網路"
 
@@ -10933,26 +12347,26 @@ msgid "Could not write"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
@@ -10964,36 +12378,36 @@ msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態（請注意：任何人都能看到您）"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -11157,8 +12571,8 @@ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息�
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
 msgid "_Group:"
 msgstr "群組(_G)："
 
@@ -11218,33 +12632,27 @@ msgstr "%s 要求您傳送檔案給他（她）。"
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 送來了一個視像聊天的邀請，但目前還沒有視像聊天的支援。"
+
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
-#  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s 在呼叫您！"
-
 # XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:957
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息："
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11253,11 +12661,16 @@ msgstr ""
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11267,11 +12680,11 @@ msgstr ""
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此很可能不會成功登入 Yahoo。請到 "
 "%s 檢查有沒有更新的版本。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11280,49 +12693,49 @@ msgstr ""
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!，官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11331,7 +12744,7 @@ msgstr ""
 "與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11340,28 +12753,28 @@ msgstr ""
 "無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -11369,92 +12782,96 @@ msgstr "走出去了"
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
 msgid "Appear Online"
 msgstr "報稱上線"
 
 # NOTE Yahoo 官方譯「永遠顯示離線」，說白一點其實即是（針對某人）「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
 msgid "Presence"
 msgstr "上線狀態"
 
 # NOTE 下次登入時不報稱離線，所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
 #  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
-msgstr "啟動哪一個 ID？"
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+msgid "Activate which ID?"
+msgstr "啟用哪一個 ID？"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
 msgid "Join whom in chat?"
-msgstr "加入哪個好友目前所在的聊天室？"
+msgstr "加入誰的聊天室？"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#  XXX 可能可以譯得生動一點
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "You have just sent a Buzz!"
-msgstr "您剛送出了一個呼叫！"
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Open Inbox"
+msgstr "開啟收件匣"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "嗶！"
+
+# XXX 這是暫譯 - acli 20070913
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;：加入位於 Yahoo! 網路的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
 msgid "list: List rooms on the Yahoo network"
 msgstr "list：列出Yahoo網路上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 給好友一個「嗶」引他（她）注意"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -11468,134 +12885,60 @@ msgstr "doodle: 要求使用者開始 Doodle Session"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Japan Pager server"
 msgstr "傳呼伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器（日本地區）"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法，有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "無法加入聊天室"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "未知聊天室"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "也許聊天室使用者已經到達上限"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "聊天室不存在"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您現在進入「%s」進行聊天。"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "無法加入好友目前所在的聊天室"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "可能他（她）並不在聊天室內？"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "讀取聊天室清單發生錯誤。"
-
-# NOTE 解「可語音聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "可語音聊天"
-
-# NOTE 解「可視像聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "可視像聊天"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "無法取得聊天室清單。"
-
-# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
-# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
-# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "使用者建立之聊天室"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
@@ -11611,86 +12954,86 @@ msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 個人資料"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "對不起，暫時並不支援內容被列為兒童不宜的個人資訊。"
 
 # NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結："
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "最新消息"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "更新日期"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "對不起，這則個人資訊似乎是使用目前尚未被支援的語言或格式。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11699,10 +13042,84 @@ msgstr ""
 "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在；然而，Yahoo! 會不"
 "時找不到使用者的個人資料。若果您知道使用者確實存在，請稍後重試。"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "邀請被婉拒了"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "無法加入聊天室"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "未知聊天室"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "也許聊天室使用者已經到達上限"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "聊天室不存在"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr "未知的錯誤。您或許需要登出並等待五分鐘，以重新進入聊天室"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您現在進入「%s」進行聊天。"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "無法加入好友目前所在的聊天室"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "可能他（她）並不在聊天室內？"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "讀取聊天室清單發生錯誤。"
+
+# NOTE 解「可語音聊天的使用者數目」(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "可語音聊天"
+
+# NOTE 解「可視像聊天的使用者數目」(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "可視像聊天"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "無法取得聊天室清單。"
+
+# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
+# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
+# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "使用者建立之聊天室"
+
 #: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
@@ -11727,11 +13144,6 @@ msgstr "（為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "使用者"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
@@ -11976,7 +13388,17 @@ msgstr "儲存狀態"
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 引起了您的注意！"
+
+#: ../libpurple/server.c:795
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11985,20 +13407,40 @@ msgstr ""
 "%s 邀請 %s 到聊天室「%s」：\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」：\n"
 
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
+# FIXME ambiguous - 20061025
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL 連線失敗"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL 交談失敗"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL peer 出示了無效的憑證"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "未知的 SSL 錯誤"
+
 #: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
@@ -12050,13 +13492,13 @@ msgstr "+++ %s 不再閒置"
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2691
+#: ../libpurple/util.c:2720
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢？譯成「它們」的話，「它們」又是什麼呢？寫長一點好了。
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2721
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12064,84 +13506,84 @@ msgid ""
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入，同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3192
+#: ../libpurple/util.c:3221
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3195
+#: ../libpurple/util.c:3224
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3250
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3241
+#: ../libpurple/util.c:3270
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3276
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3284
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3290
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3521
+#: ../libpurple/util.c:3550
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "無法打開 %s：重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3681
+#: ../libpurple/util.c:3710
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體，網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3716
+#: ../libpurple/util.c:3745
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤：%s"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3776
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤：%s"
 
-#: ../libpurple/util.c:3772
+#: ../libpurple/util.c:3801
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s：%s"
@@ -12168,39 +13610,39 @@ msgid "The orientation of the tray."
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "通訊協定(_T)："
 
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
 msgid "Screen _name:"
 msgstr "帳號(_N)："
 
 # NOTE Debian 譯「local」為「本地端」，「本機」是Windows譯法，但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
 msgid "_Local alias:"
 msgstr "帳號別名（只在本機生效）(_L)："
 
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
 msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
 msgid "New _mail notifications"
 msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I)："
 
@@ -12236,7 +13678,7 @@ msgstr "SOCKS 4"
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -12258,15 +13700,15 @@ msgstr "鴛鴦蝴蝶也看得見耶"
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
@@ -12274,10 +13716,18 @@ msgstr "通訊埠(_P)："
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "無法儲存新帳號"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "已有一個乎合指定條件的帳號。"
+
 #: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "新增帳號"
@@ -12286,19 +13736,23 @@ msgstr "新增帳號"
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "在伺服器上建立這個新帳號"
+
+#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2201
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12322,231 +13776,243 @@ msgstr ""
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:765
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:786
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
 #: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
 #: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1086
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1137
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1146
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1153
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1236
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1239
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1242
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1244
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1332
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
 #: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2866
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2867
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2868
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2869
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2844
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/好友/顯示離線好友(_O)"
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/好友/顯示"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/好友/顯示/離線好友(_O)"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/好友/顯示/空白群組(_E)"
 
-#: ../pidgin/gtkblist.c:2845
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友/顯示空白的群組(_E)"
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/好友/顯示/好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2846
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/好友/顯示好友細節(_D)"
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/好友/顯示/閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2847
-msgid "/Buddies/Show Idle _Times"
-msgstr "/好友/顯示閒置時間(_T)"
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/好友/顯示/通訊協定圖示(_P)"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2882
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2887
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2891
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2892
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/工具/憑證(_C)"
+
+#: ../pidgin/gtkblist.c:2894
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2900
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2904
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2905
 msgid "/Help/Online _Help"
 msgstr "/說明/線上說明(_H)"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2906
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2939
 #, c-format
 msgid ""
 "\n"
@@ -12555,133 +14021,133 @@ msgstr ""
 "\n"
 "<b>帳號：</b>%s"
 
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3017
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3046
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3092
 msgid "Last Seen"
 msgstr "上次登入"
 
 # XXX「Spooky」一般來說只是「恐怖」，不一定是「幽靈似的」才算「Spooky」
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3113
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3115
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3117
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3450
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "閒置 %d 日 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3452
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3454
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3599
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3601
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3639
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3819
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3821
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3822
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3823
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4038
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4064
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線：%s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4216
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱：</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4223
 msgid "<b>Password:</b>"
 msgstr "<b>密碼：</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4234
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4317
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4331
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12699,23 +14165,27 @@ msgstr ""
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/好友/顯示離線好友"
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/好友/顯示/離線好友"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/好友/顯示/空群組"
 
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Empty Groups"
-msgstr "/好友/顯示空的好的群組"
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/好友/顯示/好友細節"
 
-#: ../pidgin/gtkblist.c:4564
-msgid "/Buddies/Show Buddy Details"
-msgstr "/好友/顯示好友細節"
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/好友/顯示/閒置時間"
 
-#: ../pidgin/gtkblist.c:4567
-msgid "/Buddies/Show Idle Times"
-msgstr "/好友/顯示閒置時間"
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/好友/顯示/通訊協定圖示"
 
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:5501
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -12725,71 +14195,76 @@ msgstr ""
 "在好友清單中顯示。\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5536
 msgid "_Screen name:"
 msgstr "帳號(_S)："
 
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
 msgid "A_lias:"
 msgstr "別名(_L)："
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5823
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5839
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5880
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5968
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」，尤其是在新的「模組相關指令」清單，
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6666
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6672
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL 伺服器"
+
 #: ../pidgin/gtkconn.c:179
 #, c-format
 msgid ""
@@ -12801,225 +14276,216 @@ msgstr ""
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前，%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:462
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:777
+#: ../pidgin/gtkconv.c:754
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:830
+#: ../pidgin/gtkconv.c:807
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:837
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:881
+#: ../pidgin/gtkconv.c:858
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:942
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:980
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
-
-#: ../pidgin/gtkconv.c:1366
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」，但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思，故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2589
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2640
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2692
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2697
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令，譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2700
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2704
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2717
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "全部顯示"
+
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2863
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2865
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2870
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2872
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2873
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2875
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2879
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2880
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2884
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2886
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2894
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2898
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2905
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2915
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2916
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2917
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2839
-msgid "/Options/Show Buddy _Icon"
-msgstr "/選項/顯示好友圖示(_I)"
-
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2919
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2920
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:3044
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3100
 msgid "/Options"
 msgstr "/選項"
 
@@ -13028,177 +14494,173 @@ msgstr "/選項"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3175
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3181
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3185
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3191
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3195
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3201
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3205
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3209
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3213
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3217
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3223
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3227
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3233
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3236
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3249
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3252
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3181
-msgid "/Options/Show Buddy Icon"
-msgstr "/選項/顯示好友圖示"
-
-#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3374
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西，不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4270
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4374
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6468
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6471
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6477
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7550
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear：清空所有交談的回捲緩衝區"
 
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7714
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7746
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎？"
 
-#: ../pidgin/gtkconv.c:7978
+#: ../pidgin/gtkconv.c:8333
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7984
+#: ../pidgin/gtkconv.c:8339
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7992
+#: ../pidgin/gtkconv.c:8347
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7998
+#: ../pidgin/gtkconv.c:8353
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8444
+#: ../pidgin/gtkconv.c:8853
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8968
+#: ../pidgin/gtkconv.c:9455
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:9457
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8972 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8974
+#: ../pidgin/gtkconv.c:9461
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:9463
 msgid "By account"
 msgstr "依帳號"
 
@@ -13272,25 +14734,22 @@ msgstr "錯誤訊息"
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
 msgid "lead developer"
 msgstr "主要開發者"
 
 #: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
 #: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "開發者"
 
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "開發者兼網站管理員"
-
 #: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "支援"
@@ -13299,162 +14758,175 @@ msgstr "支援"
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "開發者兼網站管理員"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "資深貢獻者兼品管"
+
+#: ../pidgin/gtkdialogs.c:107
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:114
 msgid "XMPP developer"
 msgstr "XMPP 開發者"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:115
 msgid "original author"
 msgstr "原作者"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
 
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
 msgid "Bengali"
 msgstr "孟加拉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
 # NOTE 港譯「波斯尼亞」，台一般譯「波士尼亞」
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
 msgid "Bosnian"
 msgstr "波希尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
 msgid "German"
 msgstr "德文"
 
 # NOTE 國名是「不丹」，中譯文依國名不依語文名
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
 msgid "Dzongkha"
 msgstr "不丹文"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文，不是語，但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "愛沙尼亞文"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "French"
 msgstr "法文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
 msgid "Galician"
 msgstr "加里西亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:170
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
 msgid "Hebrew"
 msgstr "希伯來文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:172
 msgid "Hindi"
 msgstr "印度文"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:173
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:174
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -13463,54 +14935,54 @@ msgstr "印尼文"
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條，譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE 註：因 zh_TW 和 zh_HK 正式分家，還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
 msgid "Georgian"
 msgstr "喬治亞文"
 
 # FIXME 可以譯好一點 20070520 acli
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:177
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註：KDE 譯「坎納達」
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada"
 msgstr "康納達文"
 
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "Korean"
 msgstr "韓文"
 
 #  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
 #  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文，跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -13519,61 +14991,55 @@ msgstr "馬其頓文"
 #  NOTE 其他譯法包括：丹麥－挪威文（大英百科）、丹麥式挪威文（維基百科）、東挪威文、標準挪威文（國內不是標準，國外是 :P）
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:187
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:188
 msgid "Dutch, Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#  XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
-#  XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭……
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "挪威文"
-
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:189
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:193
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:194
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:195
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:196
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -13581,99 +15047,101 @@ msgstr "斯洛伐克文"
 #  NOTE 以粵語發音，跟臺譯反而發音較準；況且，這至少名義上也是zh_TW；
 #  NOTE 所以不跟港譯（其實是大陸譯法），跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:201
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」，台一般譯「塔米爾」（看來較常見）或「泰米爾」
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:205
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:206
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:207
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:221
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:346
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:384
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
-"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
-"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
-"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
-"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
-"contributors.  We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "%s 係一個以 GTK+ 開發，圖形介面式的模組化訊息程式，以 libpurple 為基礎，同時"
 "提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
-"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若您希望修"
-"改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條款即可；%s 內"
-"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作，版權歸全"
-"部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
-"何保用。<BR><BR>"
+"Lotus Sametime、Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>"
+"倘若您希望修改或發佈這個程式，只需按照 GPL（任擇第二版或較新的其他版本）的條"
+"款即可；%s 內已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著"
+"作，版權歸全部貢獻者共同所有，貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程"
+"式恕不提供任何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:402
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:407
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -13681,80 +15149,85 @@ msgstr "現任開發者"
 # NOTE Luke Schierer 說:「這些人一個是瘋了，否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份，所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:422
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:437
 msgid "Retired Developers"
 msgstr "前任開發者"
 
+# NOTE 參見「Crazy Patch Writer」條
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "前任的狂熱模組作者"
+
 #  NOTE 可譯「美工人員」，但那是很保守的譯法；Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人，所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:467
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:482
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:502
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中，最後出現，用來作除錯用的各種資訊，不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:520
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:890
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:892
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:982
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:984
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:1004
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1005
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1027
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1029
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1050
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1051
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1090
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13770,32 +15243,32 @@ msgstr[1] ""
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1098
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1101
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1132
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "您正試著將群組 %s 與 %s 合併，新群組以後者命名。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1139
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1142
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1192
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13803,42 +15276,42 @@ msgid ""
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1195
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1198
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1231
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1234
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別；可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1237
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1258
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1261
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1264
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13954,7 +15427,7 @@ msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
 msgid "_Pause"
 msgstr "暫停(_P)"
 
@@ -13964,44 +15437,44 @@ msgid "_Resume"
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」，Abiword譯「未格式化貼上」，聽來都有些怪
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -14012,7 +15485,7 @@ msgstr ""
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -14022,7 +15495,7 @@ msgstr ""
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14033,7 +15506,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -14044,130 +15517,201 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像：%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "粗體(_B)"
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "字型(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+#, fuzzy
+msgid "Group Items"
+msgstr "群組 ID："
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "解除群組"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "粗體"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "斜體(_I)"
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "底線(_U)"
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "放大字體(_L)"
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "刪除線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "_Normal"
-msgstr "正常(_N)"
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "放大字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "縮小字體(_S)"
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "縮小字體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1072
-msgid "_Font face"
-msgstr "字型(_F)"
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "字型"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "背景顏色"
 
 #  XXX 譯「文字顏色」會否較好？ - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
-msgstr "前景顏色(_F)"
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "前景顏色"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "清除格式化"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
-msgstr "背景顏色(_B)"
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "插入影像"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
+msgid "Insert Smiley"
+msgstr "插入表情"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>粗體(_B)</b>"
+
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>斜體(_I)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>底線(_U)</u>"
+
+#  NOTE 這看來是一般PO檔的譯法（印刷術語看來也沒有既有譯法）
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>刪除線</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>儲存影像途中發生錯誤</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
+msgid "_Normal"
+msgstr "正常(_N)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>縮小(_S)</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "_Font face"
 msgstr "字型(_F)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "清除格式化(_R)"
+#  XXX 譯「文字顏色」會否較好？ - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "前景顏色(_C)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "背景顏色(_K)"
 
 #  XXX
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1266
 msgid "_Smiley"
 msgstr "笑一個！(_S)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "影像(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "連結(_L)"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "橫線(_H)"
+
 #  XXX 不通順 - ambrose 20070415
 #: ../pidgin/gtklog.c:292
 #, c-format
@@ -14252,14 +15796,14 @@ msgstr "與 %s 的交談"
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏，但刪掉會有點困難（令文句難明），故暫時保留，待想到怎樣刪掉才算
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14286,7 +15830,7 @@ msgstr ""
 "哪些帳號，並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14311,48 +15855,48 @@ msgstr ""
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件！</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>您有 %d 封新郵件。</b>"
 msgstr[1] "<b>您有 %d 封新郵件。</b>"
 
-#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:957
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤：%s"
 
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1113
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
@@ -14404,100 +15948,100 @@ msgid "Select a file"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
 msgid "_Buddy name:"
 msgstr "好友名稱(_B)："
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:592
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:594
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:596
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:598
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:600
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:602
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:606
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:608
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:653
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:655
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:659
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:661
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
 #: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "預設"
 
@@ -14531,13 +16075,6 @@ msgstr "系統工作匣圖示"
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S)："
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "務必"
-
 #: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "有未讀訊息時"
@@ -14550,7 +16087,7 @@ msgstr "隱藏即時訊息交談視窗"
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H)："
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
 msgid "When away"
 msgstr "離開期間"
 
@@ -14603,9 +16140,10 @@ msgstr "新交談(_E)："
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
+#  TODO 要覆查 - acli 20070912
 #: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "顯示好友圖示(_I)"
+msgid "Show _detailed information"
+msgstr "顯示詳細資訊(_D)"
 
 #: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
@@ -14648,132 +16186,132 @@ msgstr "使用主題指定的字型(_T)"
 msgid "Conversation _font:"
 msgstr "交談用的字型(_F)："
 
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文，而是樣本本身，玩死人了 :P
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1061
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化，送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1127
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U)："
 
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1139
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例：stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1143
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1152
 msgid "Public _IP:"
 msgstr "公共IP (_I)："
 
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1181
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1184
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1187
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S)："
 
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1194
 msgid "_End port:"
 msgstr "結束通訊埠(_E)："
 
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1202
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前，不用「毋須」，改為「不使用」
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1206
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1262
 msgid "_User:"
 msgstr "使用者(_U)："
 
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1327
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1328
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1329
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1330
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1331
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1332
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1333
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1334
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1336
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1345
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1398
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1402
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1410
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O)："
 
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1412
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1413
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1415
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1429
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14782,80 +16320,63 @@ msgstr ""
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1469
 msgid "Log _format:"
 msgstr "日誌格式(_F)："
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1476
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1478
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(預設)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1624
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1636
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1638
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1644
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1646
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "音效播放方式"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1712
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1714
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "自動"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "指令"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1721
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1729
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14864,118 +16385,82 @@ msgstr ""
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "音效選項"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1756
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
 msgid "Enable sounds:"
 msgstr "啟動音效："
 
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "上線而非離開期間"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "離開期間"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1769
 msgid "Volume:"
 msgstr "音量："
 
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "事件音效"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1849
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "事件"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "測試"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "重置"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "選擇..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1926
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1931
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1940
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應："
 
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1944
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1950
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1952
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
 msgstr "閒置多少分鐘更改狀態(_M)："
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1964
 msgid "Change _status to:"
 msgstr "更改狀態為(_S)："
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1985
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1993
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態："
 
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2031
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "音效"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2040
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2044
 msgid "Status / Idle"
 msgstr "狀態／閒置"
 
@@ -15064,23 +16549,23 @@ msgstr "您確定要拒絕 %s？"
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -15122,7 +16607,7 @@ msgstr "差異"
 msgid "_Title:"
 msgstr "標題(_T)："
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "狀態(_S)："
 
@@ -15136,94 +16621,46 @@ msgstr "為部份帳號設定不同的狀態(_D)"
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
 #, c-format
 msgid "Status for %s"
 msgstr "狀態：%s"
 
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "好友登入"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "好友登出"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "收到訊息"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "訊息收到，開始進行交談"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "訊息送出"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "有人進入聊天室"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "有人離開聊天室"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "您在聊天室說話"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "有人在聊天室中提到您的名字"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer 錯誤"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer 初始化失敗。"
-
 #: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤：%s"
 
-#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄，您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -15231,23 +16668,23 @@ msgstr ""
 "您可以透過檔案傳輸、插入訊息，或者把它當成是你的好友圖示等方式，來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎？"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1550
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15255,7 +16692,7 @@ msgstr ""
 "您可以透過檔案傳輸，或者把它當成是你的好友圖示等方式，來傳送影像檔給這個使用"
 "者。"
 
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15268,17 +16705,17 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器；您大概想傳送啟動器要啟動的檔案，而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15289,25 +16726,25 @@ msgstr ""
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」：%s"
 
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15321,31 +16758,31 @@ msgstr "儲存檔案"
 msgid "Select color"
 msgstr "選擇顏色"
 
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情圖示"
 
@@ -15362,38 +16799,38 @@ msgstr "不使用表情圖示，選擇這個主題即可。"
 msgid "none"
 msgstr "無"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "顯示統計資料"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "「回答」或然率："
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "統計設定"
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限："
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #  NOTE 參閱 gtk/plugins/cap/README
 #  FIXME 但這只能是暫譯，譯文絕對有待改進
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "精密度："
 
@@ -15403,18 +16840,18 @@ msgstr "精密度："
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "好友在線狀態預測"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "好友在線狀態預測模組"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15528,19 +16965,6 @@ msgstr "收到訊息"
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
 
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "粗體"
-
-# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型，「斜體」其實是誤譯，但已根深蒂固，不可能改正
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "斜體"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "底線"
-
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "忽略收到訊息中的自訂格式"
@@ -15705,30 +17129,30 @@ msgstr "使用者細節 (_D)"
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
 #  NOTE 注意！evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -15736,7 +17160,7 @@ msgstr "Evolution 整合設定"
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
@@ -15746,7 +17170,7 @@ msgstr "請選擇新增好友至那幾個帳號。"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -15757,8 +17181,8 @@ msgstr "Evolution 整合"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -15811,6 +17235,15 @@ msgstr "GTK信號測試"
 msgid "Test to see that all ui signals are working properly."
 msgstr "檢查使用者介面的各種信號是否都能正常運作。"
 
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>好友備註</b>：%s"
+
 #: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "歷史記錄"
@@ -15860,11 +17293,11 @@ msgstr "在新訊息旁劃上標示線，以突顯交談內的新訊息。"
 msgid "Draw Markerline in "
 msgstr "在何處使用標示線"
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
@@ -15880,32 +17313,32 @@ msgstr "您收到一個音樂訊息工作階段的要求，請按MM圖示開始�
 msgid "Music messaging session confirmed."
 msgstr "成功確定音樂訊息工作階段。"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
 msgid "Music Messaging"
 msgstr "音樂訊息"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
 msgid "There was a conflict in running the command:"
 msgstr "執行下列指令時發生衝突："
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
 msgid "Error Running Editor"
 msgstr "執行編輯器途中發生錯誤"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
 msgid "The following error has occurred:"
 msgstr "發生了下列錯誤："
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
 msgid "Music Messaging Configuration"
 msgstr "音樂訊息設定"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
 msgid "Score Editor Path"
 msgstr "樂譜編輯器路徑"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
 msgid "_Apply"
 msgstr "套用(_A)"
 
@@ -15917,12 +17350,12 @@ msgstr "套用(_A)"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -15930,35 +17363,35 @@ msgstr ""
 "音樂訊息模組為音樂編寫提供即時傳訊功能，讓多個使用者能同時編輯同一份樂譜。"
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "通知種類"
 
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\t只當有人提到您的名字(_O)"
 
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "焦點視窗(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "加入字串到視窗標題之前(_S)："
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
 #  TODO 要覆查 - 20061029
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "加入新訊息數目到 X 屬性中(_X)"
 
@@ -15966,42 +17399,42 @@ msgstr "加入新訊息數目到 X 屬性中(_X)"
 # NOTE「URGENT」一字大概應該保留，因為絕大多數的視窗管理員都不支援，而且會引致奇怪的後果
 # NOTE 譯文更動 by Ambrose
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "設定視窗的「URGENT」（緊急資訊）提示(_U)"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "浮現交談視窗(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "通知移除"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
 msgstr "當交談取得輸入焦點時移除通知(_G)"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "送出訊息後移除通知(_M)"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "當視窗標籤被點選後移除通知(_B)"
 
@@ -16011,7 +17444,7 @@ msgstr "當視窗標籤被點選後移除通知(_B)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -16019,7 +17452,7 @@ msgstr "訊息通知"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
@@ -16396,45 +17829,45 @@ msgid ""
 "timestamp formats."
 msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "不透明度："
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "即時訊息交談視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "即時訊息視窗透明度(_I)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "在即時訊息視窗取得焦點時移除透明度"
 
 # XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "總是在最上層"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "好友清單視窗透明度(_B)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "取得輸入焦點時移除好友清單視窗透明度"
 
@@ -16444,19 +17877,19 @@ msgstr "取得輸入焦點時移除好友清單視窗透明度"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16467,47 +17900,47 @@ msgstr ""
 "\n"
 "* 請注意：這個模組需要至少 Win2000 的 Windows 版本才能產生效果。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime 版本"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "啟動"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "當 Windows 啟動時同時執行 %s (_S)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "可停駐的好友清單(_D)"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K)；"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "只在停駐時生效"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "收到聊天訊息後閃動視窗(_F)"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項，例如好友清單的停駐功能。"
@@ -16561,6 +17994,99 @@ msgstr "送出、讀取未加工的 XMPP 段落。"
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "您剛送出了一個呼叫！"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s 在呼叫您！"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "您因為不明原因而登出。"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "您確定要離開這個群 (Qun) 嗎？"
+
+#~ msgid "Go ahead"
+#~ msgstr "確定"
+
+#~ msgid "Server ACK"
+#~ msgstr "伺服器回應"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "Keep alive 發生錯誤，連線似乎已突然中斷！"
+
+#~ msgid "Request login token error!"
+#~ msgstr "「登入要求」Token 出現錯誤"
+
+#  NOTE 文中的「%s」是「UDP」或「TCP」，所以譯文應為「位址」而非「地址」
+#~ msgid "%s Address"
+#~ msgstr "%s 位址"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 上線"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: 離開"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: 隱身"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: 離線"
+
+#~ msgid "Modify My Information"
+#~ msgstr "修改資訊"
+
+#~ msgid "Login in TCP"
+#~ msgstr "以 TCP 登入"
+
+#~ msgid "Login Hidden"
+#~ msgstr "以隱藏狀態登入"
+
+#~ msgid "Socket send error"
+#~ msgstr "寫入 Socket 途中發生錯誤"
+
+# XXX - 20061027
+#~ msgid "Connection refused"
+#~ msgstr "連線被拒"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "您想將他（她）加入到您的好友清單嗎？"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s 在呼叫您！"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "您剛送出了一個呼叫！"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/選項/顯示好友圖示(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/選項/顯示好友圖示"
+
+#  XXX 這應該是「nn」碼，即「Nynorsk Norwegian」，所以直譯「挪威文」並不恰當
+#  XXX 但這真是「no」碼，但 no.po 其實已經不存在……無來頭……
+#~ msgid "Norwegian"
+#~ msgstr "挪威文"
+
+#~ msgid "_Bold"
+#~ msgstr "粗體(_B)"
+
+#~ msgid "_Larger"
+#~ msgstr "放大字體(_L)"
+
+#~ msgid "_Smaller"
+#~ msgstr "縮小字體(_S)"
+
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "顯示好友圖示(_I)"
+
 # NOTE 沒辦法，用不到着重號，又沒法改換字型……
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "尚未支援指令，訊息因此沒有被送出。"
@@ -16589,24 +18115,15 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "/Buddies/_About Pidgin"
 #~ msgstr "/好友/關於 Pidgin(_A)"
 
-#~ msgid "Larger font size"
-#~ msgstr "放大字體"
-
 #~ msgid "Smaller font size"
 #~ msgstr "縮小字體"
 
-#~ msgid "Reset formatting"
-#~ msgstr "清除格式化"
-
 #~ msgid "Insert link"
 #~ msgstr "插入連結"
 
 #~ msgid "Insert image"
 #~ msgstr "插入影像"
 
-#~ msgid "Insert smiley"
-#~ msgstr "插入表情"
-
 #~ msgid "Tools"
 #~ msgstr "工具"
 
@@ -16798,13 +18315,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
 #~ msgid ""
 #~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>好友別名：</b>%s"
-
-#~ msgid ""
-#~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
@@ -17033,10 +18543,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgstr "格式化帳號..."
 
 #  XXX 要覆查
-#~ msgid "Selection"
-#~ msgstr "選擇"
-
-#  XXX 要覆查
 #~ msgid "Faces"
 #~ msgstr "好友圖示"
 
@@ -17054,9 +18560,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "<i>Information below may not be accurate</i><br>\n"
 #~ msgstr "【下列資訊可能不準確】<br>\n"
 
-#~ msgid "Change My Face"
-#~ msgstr "修改好友圖示"
-
 #~ msgid "Please wait for new version"
 #~ msgstr "請等待新版本推出"
 
@@ -17113,9 +18616,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Gaim - Save As..."
 #~ msgstr "Gaim - 儲存為..."
 
-#~ msgid "Buzz!!"
-#~ msgstr "嗶！"
-
 #~ msgid "The user %s wants to add %s to his or her buddy list%s%s."
 #~ msgstr "使用者 %s 想要將 %s 加入他（她）的好友清單%s%s。"
 
@@ -17252,9 +18752,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Use TLS if available"
 #~ msgstr "TLS 可用則用"
 
-#~ msgid "Require TLS"
-#~ msgstr "需要TLS"
-
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "因為不明原因導致與伺服器連線中斷。"
 
@@ -17310,18 +18807,12 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#~ msgid "%s requested your information"
-#~ msgstr "%s 查詢您的使用者資訊"
-
 #~ msgid "%s requested a PING"
 #~ msgstr "%s 要求一個 PING"
 
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER 協定模組"
 
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "無法播放音效，因為所選取的檔案 (%s) 不存在。"
-
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
@@ -17354,9 +18845,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "目前無法使用聊天室"
 
-#~ msgid "Unable to create new connection."
-#~ msgstr "無法開啟新連結。"
-
 #~ msgid "Auth host"
 #~ msgstr "認證伺服器"
 
@@ -17417,9 +18905,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Call ended."
 #~ msgstr "結束呼叫。"
 
-#~ msgid "Calling %s"
-#~ msgstr "呼叫 %s"
-
 #~ msgid "End Call"
 #~ msgstr "結束呼叫"
 
@@ -17447,9 +18932,6 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgid "Realname"
 #~ msgstr "姓名"
 
-#~ msgid "Email Address"
-#~ msgstr "電子郵件"
-
 #~ msgid "EMail"
 #~ msgstr "電子郵件"
 
@@ -17518,194 +19000,3 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #, fuzzy
 #~ msgid "Web aware"
 #~ msgstr "允許其他使用者在網路上查看您目前的狀態"
-
-#  XXX 這個有點怪，譯錯？
-#~ msgid "Active"
-#~ msgstr "啟動"
-
-#~ msgid "Add User"
-#~ msgstr "新增使用者"
-
-#~ msgid "Write a gtkrc file with these settings to %s"
-#~ msgstr "將這些設定寫入到 %s 的 gtkrc 檔"
-
-#~ msgid "Screenname:"
-#~ msgstr "帳號："
-
-#~ msgid "Host name"
-#~ msgstr "主機名稱"
-
-#~ msgid "Default status messages"
-#~ msgstr "預設狀態訊息"
-
-#~ msgid "Edit Status Messages"
-#~ msgstr "編輯狀態訊息"
-
-#~ msgid "Set Status Messages..."
-#~ msgstr "設定狀態訊息..."
-
-#~ msgid "Not At Home"
-#~ msgstr "不在家"
-
-#~ msgid "Not At Desk"
-#~ msgstr "不在座位"
-
-#~ msgid "Not In Office"
-#~ msgstr "不在辦公室"
-
-#~ msgid "Hello!"
-#~ msgstr "您好！"
-
-#~ msgid "Gaim"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim - Signed off"
-#~ msgstr "Gaim - 已登出"
-
-#~ msgid "Gaim - Away"
-#~ msgstr "Gaim - 離開"
-
-#~ msgid "Set account idle time"
-#~ msgstr "設定帳號閒置時間"
-
-#~ msgid "Unset account idle time"
-#~ msgstr "取消帳號閒置時間設定"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "您想將他（她）加入到您的好友名單中嗎？"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "為這個好友加上別名(_A)..."
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#~ msgid "Alias Contact..."
-#~ msgstr "為這組好友加上別名..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/工具/帳號相關指令(_T)"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/工具/帳號清單(_C)"
-
-#~ msgid "Idle "
-#~ msgstr "閒置"
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/工具/帳號相關指令"
-
-#~ msgid "Active Developers"
-#~ msgstr "現任開發者"
-
-#~ msgid "Change password"
-#~ msgstr "修改密碼"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "處理事件或回覆時發生錯誤 (%s)。"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "不顯示中斷連線錯誤"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "不顯示登入錯誤"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "隱藏重新連線交談視窗"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "當你斷線時，系統會自動幫你重新連線。"
-
-# NOTE 譯文核實 by Etan Reisner (開發者之一)
-#~ msgid "Use last matching buddy"
-#~ msgstr "使用最後（而非最先）一個匹配的好友帳號"
-
-# NOTE 每行不可太長，並要人手用「\n」分隔，否則視窗會過闊
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "若果一個好友其實概括了好幾個好友帳號，通訊時便根據這裏\n"
-#~ "所給定的得分值計分，積分最少者為「優先」，成為當時實際\n"
-#~ "使用的好友帳號。\n"
-#~ "「離線」狀態預設得 4 分，「離開」兩分，「閒置」1 分。\n"
-#~ "要得出預設的優先次序「沒閒置→閒置→離開→離開兼閒置」，\n"
-#~ "使用上列的預設值即可。"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "保持對話框開啟(_K)"
-
-#~ msgid "A_way"
-#~ msgstr "離開(_W)"
-
-#~ msgid "_Idle"
-#~ msgstr "閒置(_I)"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "由閒置返回(_N)"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "瀏覽(_W)..."
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "移除好友狀態捕捉"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "在離開時，將所有的新訊息置入佇列中(_Q)"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "無法設定 AIM 離開訊息。"
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請"
-#~ "在完全登入後再設定一次。"
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "核實所有即時訊息的簽章"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "數位簽署所有頻道訊息"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "核實所有頻道訊息的簽章"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "（%d 個訊息）"
-#~ msgstr[1] "（%d 個訊息）"
-
-#~ msgid "(1 message)"
-#~ msgstr "（一個訊息）"
-
-#~ msgid "Default auto-away"
-#~ msgstr "預設自動離開"
-
-#~ msgid "_Sorting:"
-#~ msgstr "排序方式(_S)："
-
-#~ msgid "Buddy Display"
-#~ msgstr "好友顯示"
-
-# XXX 暫譯
-#~ msgid "Show more buddy details"
-#~ msgstr "顯示更多使用者細節"
-
-#~ msgid "Gnome Default"
-#~ msgstr "GNOME預設值"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "離開訊息(_M)："
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
author	Kevin Stange <kstange@pidgin.im>	2007-09-14 04:28:13 +0000
committer	Kevin Stange <kstange@pidgin.im>	2007-09-14 04:28:13 +0000
commit	dd9cf9d404f3d1e9cfa8846aec86985468cf5e5e (patch)
tree	139ea5c3eaa0c83e325f7bdd17c290342fbf0691
parent	0c117b0ee61e3b731039041899b6f48c8b16869f (diff)
parent	fbf3e95b754d283d8e29957dcfae8fa0d84d9306 (diff)
download	pidgin-dd9cf9d404f3d1e9cfa8846aec86985468cf5e5e.tar.gz