changeset 18518:7abaa571dad1

fixes #2141 committer: Luke Schierer <lschiere@pidgin.im>
author Ambrose C. Li <acli@ada.dhs.org>
date Fri, 13 Jul 2007 13:39:22 +0000
parents cedb5e44ed30
children 491b422dfdd3 5255cf9a0100
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 2043 insertions(+), 1941 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Fri Jul 13 13:35:16 2007 +0000
+++ b/po/ChangeLog	Fri Jul 13 13:39:22 2007 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.1.0
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Mar Castro)
--- a/po/zh_TW.po	Fri Jul 13 13:35:16 2007 +0000
+++ b/po/zh_TW.po	Fri Jul 13 13:39:22 2007 +0000
@@ -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.473 2007/06/14 08:14:46 acli Exp $
+# $InternalId: zh_TW.po,v 1.478 2007/07/13 08:23:06 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -49,9 +49,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.2\n"
-"POT-Creation-Date: 2007-06-13 07:40-0400\n"
-"PO-Revision-Date: 2007-06-14 01:22-0400\n"
-"Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
+"POT-Creation-Date: 2007-07-12 03:22-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"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,12 +59,20 @@
 "Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:180
+#  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
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -85,15 +93,8 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#  NOTE Untranslated
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
 #  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:682
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -103,97 +104,105 @@
 "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,"
 "並透過 http://developer.pidgin.im 回報這個錯誤。"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:122
 msgid "Account was not added"
 msgstr "帳號未被新增"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:123
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:430
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:440
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:3996
+#: ../finch/gntaccount.c:478
+msgid "There's no protocol plugins installed."
+msgstr "未有安裝任何協定模組。"
+
+#: ../finch/gntaccount.c:479
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(大概是忘記了執行「make install」了。)"
+
+#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "修改帳號"
 
 # XXX check
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:489
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:522
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:535
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:545
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
+#: ../finch/gntaccount.c:875 ../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:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../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:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../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:6046
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../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
@@ -221,160 +230,162 @@
 #: ../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:1916
-#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5889
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../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
+#: ../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
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:628
 msgid "Delete Account"
 msgstr "刪除帳號"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
+#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2104 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:668
 msgid "You can enable/disable accounts from the following list."
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
 #: ../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
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5888 ../pidgin/gtkconv.c:1687
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
 #  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:924 ../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:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
+#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2574
+#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "給予認證"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "所指定的帳號目前沒有連線。"
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2844
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "別名"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
 msgid "Group"
 msgstr "群組"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2975 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
 msgid "Account"
 msgstr "帳號"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -383,187 +394,185 @@
 #: ../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:5394
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "聊天"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../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
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "名稱"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5774
+#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:411
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:425
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:438
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5885
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:445
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:793
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:794 ../finch/gntstatus.c:202
 msgid "Edit"
 msgstr "修改"
 
-#: ../finch/gntblist.c:786
+#: ../finch/gntblist.c:810
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:819
 msgid "Edit Settings"
 msgstr "修改設定"
 
 # XXX 20070518
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "資訊"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:277
-#: ../pidgin/gtkconv.c:682 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:899
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1635
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:910
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:991
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
 msgid "Rename"
 msgstr "重命名"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:993
 msgid "Set Alias"
 msgstr "設定別名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:994
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1070
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1078
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1083
 #, 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:1057
+#: ../finch/gntblist.c:1086
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1684 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4240
+#: ../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
 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:1218
+#: ../finch/gntblist.c:1247
 msgid "Place tagged"
 msgstr "移動已標記的項目"
 
 # FIXME - 20061122
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1252
 msgid "Toggle Tag"
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../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:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../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
 #: ../libpurple/protocols/qq/buddy_info.c:43
@@ -575,25 +584,29 @@
 #: ../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:2999
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "暱稱"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2868
+#: ../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:3419 ../pidgin/gtkprefs.c:1848
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "閒置"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1320
+msgid "On Mobile"
+msgstr "使用行動裝置中"
+
+#: ../finch/gntblist.c:1400
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -602,12 +615,12 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1421
 #, c-format
 msgid ""
 "\n"
@@ -617,51 +630,51 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
 # NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "模組清單"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../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:1389
+#: ../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:6045
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -680,48 +693,52 @@
 #: ../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:3995
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../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
 msgid "OK"
 msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2223
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2227
+msgid "Show empty groups"
+msgstr "顯示空的好的群組"
+
+#: ../finch/gntblist.c:2233
 msgid "Show offline buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2239
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2243
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2247
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -733,47 +750,42 @@
 "\n"
 "在您更正這個錯誤並重新啟動這個帳號前,Finch 將不會再試著重新連線。"
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:524
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:527
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-# NOTE 沒辦法,用不到着重號,又沒法改換字型……
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "尚未支援指令,訊息因此沒有被送出。"
-
 # XXX 這是什麼?
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -782,48 +794,48 @@
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "您離開了聊天室。"
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:394
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:430
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:433
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -831,60 +843,60 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7211
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7214
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7217
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7220
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7223
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins:顯示「模組」視窗"
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:顯示好友清單。"
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts:顯示帳號清單。"
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin:顯示除錯視窗"
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs:顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses:「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -892,15 +904,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "過濾器:"
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "暫停"
 
@@ -909,185 +921,184 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "檔案傳輸:%2$d 個檔案完成了 %1$d%%"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "進度"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "檔名"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "大小"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "速度"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "剩餘"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
 #: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../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:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2657
-#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../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/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
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "狀態"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "所有的檔案傳輸完畢時,關閉這個視窗"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "清除已完成的傳輸"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "中止"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "關閉"
 
 #  XXX 暫譯
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "已取消"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "失敗"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
+#  XXX pending Paladin's confirmation - acli 20070713
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "電子郵件"
 
 # XXX 要覆查
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "您收到郵件!"
 
-# FIXME 原文一詞兩義,根本無法翻譯
-#  NOTE gntnotify 字義為「發信人」
-#  NOTE Jabber 術語字義見「Both」條
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "已認證對方"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "發信人"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:917
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "繼續"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1663 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "資訊"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1624
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "加入"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "邀請"
 
 # TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "錯誤"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "模組載入失敗"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "模組卸載失敗"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1104,36 +1115,42 @@
 "網站:%s\n"
 "檔名:%s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前,請先載入模組。"
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "設定模組"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. 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
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -1142,7 +1159,7 @@
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1151,7 +1168,7 @@
 msgstr "好友名稱:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
@@ -1196,7 +1213,7 @@
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "執行動作"
 
@@ -1224,193 +1241,209 @@
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
 #, 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:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../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
 msgid "Never"
 msgstr "從不"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "顯示離線好友"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "通知您的好友您正在發訊息給他們"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "日誌格式"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "記錄所有即時訊息內容"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "記錄所有聊天內容"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "記錄所有的狀態改變"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "閒置時間基準(_R)"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "閒置時更改狀態"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "閒置多少分鐘更改狀態"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "更改狀態為"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
+#: ../pidgin/gtkrequest.c:1572
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
+#: ../pidgin/gtkrequest.c:1573
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:136
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "您確定要刪除「%s」?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:139
 msgid "Delete Status"
 msgstr "移除狀態"
 
 # FIXME 譯得太差了
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義,根本無法翻譯
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "職銜"
 
 # NOTE 應指儲存時的格式
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "格式"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
 #: ../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:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../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
 #: ../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:5506
-#: ../libpurple/protocols/oscar/oscar.c:5724
-#: ../libpurple/protocols/oscar/oscar.c:5738
-#: ../libpurple/protocols/oscar/oscar.c:5754
-#: ../libpurple/protocols/oscar/oscar.c:5761
-#: ../libpurple/protocols/oscar/oscar.c:5768
+#: ../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/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1421,57 +1454,57 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "訊息"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
 msgid "Use"
 msgstr "使用"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:297
 msgid "Invalid title"
 msgstr "標題無效"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:298
 msgid "Please enter a non-empty title for the status."
 msgstr "請為這個狀態輸入一個非空白的標題。"
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:305
 msgid "Duplicate title"
 msgstr "標題重覆"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:306
 msgid "Please enter a different title for the status."
 msgstr "為給這個狀態輸入另一個標題。"
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:446
 msgid "Substatus"
 msgstr "子狀態"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:472
 msgid "Message:"
 msgstr "訊息:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:521
 msgid "Edit Status"
 msgstr "修改狀態"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:563
 msgid "Use different status for following accounts"
 msgstr "為部份帳號設定不同的狀態"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:597
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "狀態"
 
@@ -1631,12 +1664,12 @@
 msgstr "找不到 %s 的協定模組"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3992
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "連線錯誤"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
@@ -1683,22 +1716,22 @@
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5284 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../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
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "好友"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "好友清單"
 
@@ -1717,86 +1750,86 @@
 msgstr "+++ %s 登出"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "無法送出訊息:這個訊息太大了。"
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "無法送出訊息給 %s。"
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "送出訊息(_S)"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結:%s"
 
 # TODO 覆查譯文 - 20061028
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "無法取得名稱:%s"
 
 # TODO 覆查譯文 - 20061028
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱:%s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "因下列原因,Purple 的 D-BUS 伺服器未有執行"
 
@@ -1850,7 +1883,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1859,7 +1892,7 @@
 "讀取 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1868,7 +1901,7 @@
 "寫入 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1877,40 +1910,40 @@
 "存取 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "目錄是唯讀的。"
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "無法傳送目錄。"
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1921,60 +1954,60 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -2133,32 +2166,32 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "指令是否應處理「ymsgr」網址"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "純文字"
 
 #  NOTE: xfce 譯「flat file」為「平面檔案」
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "舊式平面檔案"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "無法記錄這個交談。"
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2167,7 +2200,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2177,16 +2210,16 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, 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:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
@@ -2276,13 +2309,13 @@
 
 #: ../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:1440
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:5838
-#: ../libpurple/protocols/oscar/oscar.c:5893
-#: ../libpurple/protocols/oscar/oscar.c:6119
-#: ../libpurple/protocols/oscar/oscar.c:6189 ../libpurple/request.h:1387
+#: ../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/request.h:1397
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -2315,12 +2348,12 @@
 msgstr "自動拒絶"
 
 #  NOTE 這些都是視窗標題
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2328,11 +2361,11 @@
 "檔案儲存路徑\n"
 "(請提供完整路徑)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "自動拒絕非來自好友清單中的使用者"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2575,7 +2608,7 @@
 #. * 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:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
@@ -2620,61 +2653,68 @@
 #. 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:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2344
+#: ../libpurple/plugins/log_reader.c:2467
 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:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2357
+#: ../libpurple/plugins/log_reader.c:2472
 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:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2369
+#: ../libpurple/plugins/log_reader.c:2476
 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:2027
-#: ../libpurple/plugins/log_reader.c:2112
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#: ../libpurple/plugins/log_reader.c:2383
+#: ../libpurple/plugins/log_reader.c:2481
+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:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2395
+#: ../libpurple/plugins/log_reader.c:2485
+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
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2449
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2453
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
 #  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等(後兩者似乎只限用於數學)
 #  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則;單從字義判斷,合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2457
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2463
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -2684,20 +2724,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2518
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2522
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2153
+#: ../libpurple/plugins/log_reader.c:2526
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3051,17 +3091,17 @@
 #: ../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:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4519
-#: ../libpurple/protocols/oscar/oscar.c:5584
+#: ../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:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "離開"
 
@@ -3131,30 +3171,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
@@ -3233,7 +3273,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "密碼"
 
@@ -3258,10 +3298,10 @@
 msgstr "請輸入以下的欄位"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
@@ -3271,7 +3311,7 @@
 msgstr "出生年"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../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
@@ -3284,14 +3324,14 @@
 msgstr "男性或女性"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "男"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/oscar/oscar.c:3746
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3351,149 +3391,149 @@
 msgstr "新增到聊天室..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5556
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../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:3398
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "離線"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../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:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "上線"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3687
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../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/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:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3899
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3925
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
 # FIXME 這不像對,要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -3508,16 +3548,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
@@ -3545,9 +3585,9 @@
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
@@ -3588,7 +3628,7 @@
 msgstr "頻道(_C):"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "密碼(_P):"
 
@@ -3598,15 +3638,15 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../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/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "連線中"
 
@@ -3624,7 +3664,7 @@
 msgstr "無法建立 Socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -3650,7 +3690,7 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "使用者"
 
@@ -3660,7 +3700,7 @@
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "主題"
 
@@ -3672,19 +3712,19 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6623
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
@@ -3697,21 +3737,21 @@
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../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/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
@@ -3728,7 +3768,7 @@
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3738,7 +3778,7 @@
 #. 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:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -3772,7 +3812,7 @@
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/oscar/oscar.c:3714
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4052,7 +4092,7 @@
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -4241,7 +4281,7 @@
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
@@ -4249,14 +4289,14 @@
 msgstr "全名"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../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:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "名"
 
@@ -4266,47 +4306,47 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "市/村"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "省/州"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../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:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../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
@@ -4316,53 +4356,53 @@
 msgstr "電子郵件"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "職責"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3763
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:979
 #: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
-#: ../pidgin/gtkprefs.c:680
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "描述"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "編輯 XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -4371,66 +4411,66 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../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
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3815
 #: ../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:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -4439,43 +4479,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5760
+#: ../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/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4483,70 +4523,70 @@
 "請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 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:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位,以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3702
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/oscar/oscar.c:3728
+#: ../libpurple/protocols/oscar/oscar.c:3737
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../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/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "搜尋"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5246
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
@@ -4696,7 +4736,7 @@
 msgstr "註冊成功"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
@@ -4711,8 +4751,8 @@
 msgstr "已經註冊"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "State"
 msgstr "省/州"
 
@@ -4744,29 +4784,29 @@
 msgstr "註冊新的 XMPP 帳戶"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../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
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -4775,84 +4815,91 @@
 # 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:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
+# FIXME 原文一詞兩義,根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "已認證對方"
+
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../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:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../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:1405
-#: ../libpurple/protocols/oscar/oscar.c:6351
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -4860,52 +4907,52 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1486
 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:1494
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "項目未找到"
 
 # FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 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:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -4913,78 +4960,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 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:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 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:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -4994,11 +5041,11 @@
 # 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:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
@@ -5006,170 +5053,170 @@
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 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:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 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:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 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:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 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:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 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:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 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:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 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:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 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:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 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:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 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:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, 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:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, 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:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
+#: ../libpurple/protocols/jabber/jabber.c:1829
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [新主題]:檢視或修改聊天主題"
+
 #: ../libpurple/protocols/jabber/jabber.c:1835
-msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [新主題]:檢視或修改聊天主題"
-
-#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5178,7 +5225,7 @@
 "在這聊天室內的等級"
 
 #  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5186,19 +5233,19 @@
 "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
 "這聊天室內的身份。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -5213,34 +5260,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 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:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "域名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:216
 #: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -5282,35 +5329,35 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -5577,7 +5624,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1381
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5766,12 +5813,12 @@
 msgstr "取得個人資訊時發生錯誤"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "一般"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3769
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
@@ -5868,7 +5915,7 @@
 msgstr "住家電話2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3807
 msgid "Home Address"
 msgstr "住家地址"
 
@@ -5904,7 +5951,7 @@
 msgstr "職銜"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Company"
 msgstr "公司名稱"
 
@@ -5926,7 +5973,7 @@
 msgstr "商務電話2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Work Address"
 msgstr "工作地址"
 
@@ -6036,8 +6083,8 @@
 #: ../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:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "無法連線"
 
@@ -6158,7 +6205,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3455
+#: ../libpurple/protocols/oscar/oscar.c:3481
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -6237,7 +6284,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "因為無法與伺服器建立工作階段,所以訊息無法送出(這大概是伺服器出現了問題,請"
@@ -6823,7 +6870,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -6834,7 +6881,7 @@
 "編碼;如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
 "欄位指定。)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6844,22 +6891,22 @@
 "用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2310
-#: ../pidgin/gtkutils.c:2340
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6867,33 +6914,33 @@
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5962
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
 # NOTE 據其他PO檔的譯文看,「AP」應該不是「應用程式」
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP 使用者"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6904,100 +6951,100 @@
 # 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:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5732
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../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:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "上線"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2847
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2867
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -7006,7 +7053,7 @@
 "無法連線至認證伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -7015,54 +7062,54 @@
 "無法連線到 BOS 伺服器:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
-"並只含英文字母、數字及空白;或者只由數字組成。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1328
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;"
+"或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
 #: ../libpurple/protocols/simple/simple.c:1037
 #: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -7070,44 +7117,44 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1412
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1440
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1454
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1455
 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:1439
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5837
-#: ../libpurple/protocols/oscar/oscar.c:6118 ../libpurple/request.h:1387
+#: ../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
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:1539
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7116,53 +7163,53 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1499
+#: ../libpurple/protocols/oscar/oscar.c:1542
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
+#: ../libpurple/protocols/oscar/oscar.c:1627
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:1630
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1641
+#: ../libpurple/protocols/oscar/oscar.c:1659
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1715
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2201
+#: ../libpurple/protocols/oscar/oscar.c:2220
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2248
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2249
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2270
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../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
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2276
+#: ../libpurple/protocols/oscar/oscar.c:2295
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7172,17 +7219,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2424
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7195,7 +7242,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2447
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7208,7 +7255,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2455
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7221,38 +7268,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2488
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2553
+#: ../libpurple/protocols/oscar/oscar.c:2572
 #, 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:2562
+#: ../libpurple/protocols/oscar/oscar.c:2581
 #, 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:2571
+#: ../libpurple/protocols/oscar/oscar.c:2590
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7262,21 +7309,21 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2580
+#: ../libpurple/protocols/oscar/oscar.c:2599
 #, 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:2589
+#: ../libpurple/protocols/oscar/oscar.c:2608
 #, 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:2598
+#: ../libpurple/protocols/oscar/oscar.c:2617
 #, 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."
@@ -7284,70 +7331,63 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2753
+#: ../libpurple/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2753
-#: ../libpurple/protocols/oscar/oscar.c:2758
-#: ../libpurple/protocols/oscar/oscar.c:2820
-#: ../libpurple/protocols/oscar/oscar.c:2824
+#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2777
+#: ../libpurple/protocols/oscar/oscar.c:2841
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2756
+#: ../libpurple/protocols/oscar/oscar.c:2775
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:2841
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/oscar/oscar.c:2823
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "無法取得使用者 %s 的個人資訊:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:2872
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2877
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2882
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libpurple/protocols/oscar/oscar.c:2892
+#: ../libpurple/protocols/oscar/oscar.c:2912
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:2918
+#: ../libpurple/protocols/oscar/oscar.c:2940
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/oscar/oscar.c:2995
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3182
+#: ../libpurple/protocols/oscar/oscar.c:3208
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3385
+#: ../libpurple/protocols/oscar/oscar.c:3411
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7355,114 +7395,114 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/oscar/oscar.c:3483
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3470
+#: ../libpurple/protocols/oscar/oscar.c:3496
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3773
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3771
+#: ../libpurple/protocols/oscar/oscar.c:3797
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3809
+#: ../libpurple/protocols/oscar/oscar.c:3835
 msgid "Work Information"
 msgstr "工作資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3865
+#: ../libpurple/protocols/oscar/oscar.c:3891
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3905
+#: ../libpurple/protocols/oscar/oscar.c:3931
 #, 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:3910
+#: ../libpurple/protocols/oscar/oscar.c:3936
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3962
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3957
+#: ../libpurple/protocols/oscar/oscar.c:3983
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3959
+#: ../libpurple/protocols/oscar/oscar.c:3985
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:3990
+#: ../libpurple/protocols/oscar/oscar.c:4016
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:3993
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, 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:3996
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3999
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, 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:4002
+#: ../libpurple/protocols/oscar/oscar.c:4028
 #, 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:4005
+#: ../libpurple/protocols/oscar/oscar.c:4031
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7470,37 +7510,37 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4034
 #, 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:4011
+#: ../libpurple/protocols/oscar/oscar.c:4037
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4049
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4195
+#: ../libpurple/protocols/oscar/oscar.c:4221
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7509,7 +7549,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4476
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7520,11 +7560,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4481
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4526
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7535,32 +7575,32 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4531
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4600
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須以英"
-"文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
-"字」組成。"
-
-#: ../libpurple/protocols/oscar/oscar.c:4602
-#: ../libpurple/protocols/oscar/oscar.c:5025
-#: ../libpurple/protocols/oscar/oscar.c:5039
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須為有"
+"效電郵地址;或者必須以英文字母為開頭,同時由「英文字母」、「數字」和「空白」"
+"所組成,或者單純以「數字」組成。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4706
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4733
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -7568,16 +7608,16 @@
 "AIM 伺服器暫時無法送出您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
 "個小時後取得。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4911
-#: ../libpurple/protocols/oscar/oscar.c:4912
-#: ../libpurple/protocols/oscar/oscar.c:4917
-#: ../libpurple/protocols/oscar/oscar.c:5093
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5099
+#: ../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:5126
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5023
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7586,22 +7626,17 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5023
-#: ../libpurple/protocols/oscar/oscar.c:5037
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5037
-#, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
-"過所系統允許的上限。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5130
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "無法把 %s 加入好友清單,原因不明。"
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7611,23 +7646,23 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5138
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, 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:5212
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7637,32 +7672,32 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5292
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5521
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "離開訊息"
 
 # XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5526
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
@@ -7670,89 +7705,90 @@
 #  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:5726
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5913
 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:5892
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5927
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:5976
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6116
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6162
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7760,74 +7796,74 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6183
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6346
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6357
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6371
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6382
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6393
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6399
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6404
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6472
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "顯示您閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6630
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7863,10 +7899,6 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "連線(_C)"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "基本資訊"
@@ -8047,13 +8079,13 @@
 msgstr "無效的 QQ 表情"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "請輸入原因:"
 
@@ -8066,13 +8098,13 @@
 #  NOTE 中文採用「你」應該也是恰當的。
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "對不起,我和你,合不來的……"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../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"
@@ -8096,14 +8128,14 @@
 msgstr "使用者 %d 需要認證"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../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/group_join.c:135
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎?"
 
@@ -8111,8 +8143,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "送出"
 
@@ -8162,59 +8194,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "您只可搜尋永久群組\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "原因:%s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../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
 msgid "Approve"
 msgstr "允許"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../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"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../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"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "群組「%2$d」新增了您 [%1$d]"
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
@@ -8238,90 +8270,90 @@
 msgid "Unknown status"
 msgstr "狀態不明"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "您成功離開群組"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "您確定要離開這個群 (Qun) 嗎?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "確定"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "代碼 0x%02X:%s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "允許這個要求?"
 
 #  NOTE QQ「member」應是「成員」
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "成功更改了群的一個成員"
 
 # FIXME 暫譯 ambrose 20070415
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "成功更改了群的資訊"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "設定"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "系統訊息"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "伺服器回應"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "送出即時訊息失敗\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "送出即時訊息失敗。"
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr "Keep alive 發生錯誤,連線似乎已突然中斷!"
 
@@ -8335,8 +8367,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "無法連結。"
@@ -8490,27 +8522,27 @@
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d 拒絕了檔案「%s」"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "傳送檔案"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "連線中斷"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "登入失敗,沒有回應"
 
@@ -8761,7 +8793,7 @@
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4290
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
 msgid "Topic:"
 msgstr "主題:"
 
@@ -8788,7 +8820,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3997
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "連線"
 
@@ -8964,7 +8996,8 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐,把他(她)們新增至好友清"
 "單內,或向他(她)們發出訊息。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
 msgid "Search Results"
 msgstr "搜尋結果"
 
@@ -9792,7 +9825,7 @@
 msgstr "交換密鑰失敗"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "連線已逾時"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -10239,7 +10272,7 @@
 msgstr "您目前的心情"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "正常"
 
@@ -10620,74 +10653,74 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "網路"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
 # XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
 #  XXX 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
 #  XXX 但其實譯文並不統一 - acli 20070614
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "使用完全向前保密 (PFS)"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
 #  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
@@ -11123,8 +11156,8 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5493
-#: ../pidgin/gtkblist.c:5847
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -11282,8 +11315,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "連線錯誤"
@@ -11488,77 +11521,77 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../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:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "未知聊天室"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "也許聊天室使用者已經到達上限"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "聊天室不存在"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../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:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../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:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../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:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
@@ -11570,9 +11603,9 @@
 msgstr "送出 Doodle 要求。"
 
 # TODO - 覆查譯文 - 20061028
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
@@ -11928,12 +11961,12 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
 # FIXME 這很明顯是誤譯,但想不到怎樣寫才對 - 20061025
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "儲存狀態"
 
@@ -11942,7 +11975,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11951,12 +11984,12 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -11964,9 +11997,13 @@
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "離線"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "請勿打擾"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "長時間離開"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -12007,18 +12044,18 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2691
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
 # NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2692
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12026,84 +12063,84 @@
 msgstr ""
 "在解析您的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3192
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3195
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3221
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3241
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3247
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3255
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3261
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3521
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "無法打開 %s:重新導向的次數超過了上限"
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3681
 #, 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:3584
+#: ../libpurple/util.c:3716
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3772
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -12144,61 +12181,61 @@
 
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "帳號別名(只在本機生效)(_L):"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -12207,60 +12244,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1004
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2003
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2203
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12284,222 +12321,231 @@
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:727
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../pidgin/gtkblist.c:748
+#: ../pidgin/gtkblist.c:784
 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:759 ../pidgin/gtkblist.c:5441
-#: ../pidgin/gtkblist.c:5808 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1048 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1048
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1099
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1102 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1108
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../pidgin/gtkblist.c:1115
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:1119 ../pidgin/gtkblist.c:1123
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkblist.c:1144
-#: ../pidgin/gtkblist.c:1233 ../pidgin/gtkblist.c:1254
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/gtkblist.c:1146
-#: ../pidgin/gtkblist.c:1235 ../pidgin/gtkblist.c:1256
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../pidgin/gtkblist.c:1198
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../pidgin/gtkblist.c:1201
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1221 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1223
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkblist.c:1284
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1289
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1534 ../pidgin/gtkblist.c:1546
-#: ../pidgin/gtkblist.c:4543 ../pidgin/gtkblist.c:4553
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../pidgin/gtkblist.c:2006 ../pidgin/gtkconv.c:4650
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../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:2846
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2847
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../pidgin/gtkblist.c:2855
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2859
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../pidgin/gtkblist.c:2862
-msgid "/Buddies/_About Pidgin"
-msgstr "/好友/關於 Pidgin(_A)"
-
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2867 ../pidgin/gtkblist.c:6506
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2879
-msgid "/Tools/_Debug Window"
-msgstr "/工具/除錯視窗(_D)"
-
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
-#: ../pidgin/gtkblist.c:2909
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/說明(_H)"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/說明/線上說明(_H)"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/說明/除錯視窗(_D)"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/說明/關於(_A)"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12508,7 +12554,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:2987
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "好友別名"
 
@@ -12520,7 +12566,7 @@
 msgid "Last Seen"
 msgstr "上次登入"
 
-# XXX
+# XXX「Spooky」一般來說只是「恐怖」,不一定是「幽靈似的」才算「Spooky」
 #: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "幽靈似的"
@@ -12533,103 +12579,108 @@
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3414
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "閒置 %d 日 %d 小時 %02d 分"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3416
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3561
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3562 ../pidgin/gtkblist.c:3595
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3563
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3564
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3565 ../pidgin/gtkblist.c:3598
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3566
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../pidgin/gtkblist.c:3601
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../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:3781
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3783
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../pidgin/gtkblist.c:3784
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../pidgin/gtkblist.c:3785
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../pidgin/gtkblist.c:3987 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:3997
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../pidgin/gtkblist.c:4021
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../pidgin/gtkblist.c:4173
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4180
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4276
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4290
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12647,23 +12698,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4537
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../pidgin/gtkblist.c:4540
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../pidgin/gtkblist.c:4546
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../pidgin/gtkblist.c:4549
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../pidgin/gtkblist.c:5418
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -12673,68 +12724,68 @@
 "在好友清單中顯示。\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5453
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "帳號(_S):"
 
-#: ../pidgin/gtkblist.c:5475 ../pidgin/gtkblist.c:5829
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "別名(_L):"
 
-#: ../pidgin/gtkblist.c:5741
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5757
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5798
+#: ../pidgin/gtkblist.c:5824
 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:5886
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6526
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6550
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6563 ../pidgin/gtkconv.c:3024
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6571
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6583
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6638
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6708
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
@@ -12749,391 +12800,404 @@
 "%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
 
-#: ../pidgin/gtkconv.c:793 ../pidgin/gtkconv.c:819
+#: ../pidgin/gtkconv.c:485
+msgid "Unknown command."
+msgstr "未知的指令"
+
+#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../pidgin/gtkconv.c:813
+#: ../pidgin/gtkconv.c:777
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:866
+#: ../pidgin/gtkconv.c:830
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:896
+#: ../pidgin/gtkconv.c:860
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:917
+#: ../pidgin/gtkconv.c:881
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:937 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:994 ../pidgin/gtkconv.c:2548 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:964
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:1036
+#: ../pidgin/gtkconv.c:1000
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1185 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1211 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1394
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1402
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../pidgin/gtkconv.c:1650
+#: ../pidgin/gtkconv.c:1614
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1617
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../pidgin/gtkconv.c:1673
+#: ../pidgin/gtkconv.c:1637
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1696
+#: ../pidgin/gtkconv.c:1660
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2556
+#: ../pidgin/gtkconv.c:2514
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2607
+#: ../pidgin/gtkconv.c:2565
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2659
+#: ../pidgin/gtkconv.c:2617
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2622
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2667
+#: ../pidgin/gtkconv.c:2625
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2629
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2684
+#: ../pidgin/gtkconv.c:2642
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2833
+#: ../pidgin/gtkconv.c:2791
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2835
+#: ../pidgin/gtkconv.c:2793
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2794
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2845
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2807
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2857
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2859
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2866
+#: ../pidgin/gtkconv.c:2824
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2826
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2832
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2836
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2837
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2838
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2881
+#: ../pidgin/gtkconv.c:2839
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../pidgin/gtkconv.c:2883
+#: ../pidgin/gtkconv.c:2841
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2842
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2918
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
+#: ../pidgin/gtkconv.c:3026
+msgid "/Options"
+msgstr "/選項"
+
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3048 ../pidgin/gtkconv.c:3080
+#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3088
+#: ../pidgin/gtkconv.c:3101
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3094
+#: ../pidgin/gtkconv.c:3107
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3098
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3104
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3108
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3114
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3118
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3135
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3130
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3136
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../pidgin/gtkconv.c:3140
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkconv.c:3159
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3162
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3175
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3165
+#: ../pidgin/gtkconv.c:3178
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3168
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../pidgin/gtkconv.c:3252 ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3310
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3479
+#: ../pidgin/gtkconv.c:3492
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../pidgin/gtkconv.c:4193
+#: ../pidgin/gtkconv.c:4206
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4344
+#: ../pidgin/gtkconv.c:4310
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5536 ../pidgin/gtkconv.c:5657
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6231 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6222
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6242
+#: ../pidgin/gtkconv.c:6227
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../pidgin/gtkconv.c:6247 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6252
+#: ../pidgin/gtkconv.c:6237
 msgid "New Event"
 msgstr "新事件"
 
-#: ../pidgin/gtkconv.c:7384
+# XXX
+#: ../pidgin/gtkconv.c:7210
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear:清空所有交談的回捲緩衝區"
+
+#: ../pidgin/gtkconv.c:7374
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7416
+#: ../pidgin/gtkconv.c:7406
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:7938
+#: ../pidgin/gtkconv.c:7967
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:7944
+#: ../pidgin/gtkconv.c:7973
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:7952
+#: ../pidgin/gtkconv.c:7981
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:7958
+#: ../pidgin/gtkconv.c:7987
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8344
+#: ../pidgin/gtkconv.c:8433
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:8867
+#: ../pidgin/gtkconv.c:8957
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:8869
+#: ../pidgin/gtkconv.c:8959
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:8871 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:8961 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:8873
+#: ../pidgin/gtkconv.c:8963
 msgid "By group"
 msgstr "依群組"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:8965
 msgid "By account"
 msgstr "依帳號"
 
@@ -13269,7 +13333,7 @@
 msgstr "阿拉伯文"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
@@ -13285,8 +13349,8 @@
 msgstr "波希尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "加泰隆文"
 
@@ -13295,7 +13359,7 @@
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "捷克文"
 
@@ -13304,7 +13368,7 @@
 msgstr "丹麥文"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "德文"
 
@@ -13336,9 +13400,9 @@
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "西班牙文"
 
@@ -13351,45 +13415,45 @@
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 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:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "加里西亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "古吉拉特文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "希伯來文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "印度文"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "印尼文"
 
@@ -13398,53 +13462,54 @@
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
 #  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "義大利文"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "日文"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "喬治亞文"
 
 # FIXME 可以譯好一點 20070520 acli
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註:KDE 譯「坎納達」
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "康納達文"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "康納達文翻譯小組"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "韓文"
 
 #  NOTE 港譯只有「庫爾德」,台譯有「庫德」(標準譯法,看來亦較常見)和「庫爾德」
 #  NOTE 註:因 zh_TW 和 zh_HK 正式分家,保留台式譯法「庫德」
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "馬其頓文"
 
@@ -13453,56 +13518,61 @@
 #  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
 #  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokmål Norwegian"
 msgstr "標準挪威文"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
-#: ../pidgin/gtkdialogs.c:178
+#  XXX 這應該是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
+#  XXX 但這真是「no」碼,但 no.po 其實已經不存在……無來頭……
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
+msgstr "挪威文"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:185
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
 #  NOTE「普什圖」在三地都看來是較正常的譯法
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:186
 msgid "Pashto"
 msgstr "普什圖文"
 
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "俄文"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -13510,74 +13580,74 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "阿爾巴尼亞文"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "坦米爾文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "德拉威文"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "泰文"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "港式中文"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13597,12 +13667,12 @@
 "部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
 "何保用。<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 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:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "現任開發者"
 
@@ -13610,80 +13680,80 @@
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "前任開發者"
 
 #  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:953
 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:979
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13699,32 +13769,32 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1101
 #, 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:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13732,42 +13802,42 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1200
 #, 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:1209
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1227
 #, 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:1236
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
@@ -13868,69 +13938,69 @@
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "所有的檔案傳輸完畢時,關閉這個視窗(_F)"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "恢復(_R)"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13941,7 +14011,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13951,7 +14021,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13962,7 +14032,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13973,137 +14043,146 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "粗體"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "粗體(_B)"
 
 # NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "斜體"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "底線"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr "放大字體"
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr "縮小字體"
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "字型"
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "斜體(_I)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "底線(_U)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "放大字體(_L)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1069
+msgid "_Normal"
+msgstr "正常(_N)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "縮小字體(_S)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "字型(_F)"
 
 #  XXX 譯「文字顏色」會否較好? - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "前景顏色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "背景顏色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "清除格式化"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "插入連結"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "插入影像"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "插入表情"
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "前景顏色(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "背景顏色(_B)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "字型(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "清除格式化(_R)"
+
+#  XXX
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "笑一個!(_S)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "影像(_I)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "連結(_L)"
 
 #  XXX 不通順 - ambrose 20070415
-#: ../pidgin/gtklog.c:267
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄,與 %1$s 交談的日誌?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄,在聊天室「%1$s」交談的日誌?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -14111,22 +14190,22 @@
 msgstr "您確定您要刪除由%s開始記錄的系統日誌?"
 
 #  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
 #  NOTE 第一個 %s 是聯絡人名稱,第二個 %s 是時間
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -14134,51 +14213,52 @@
 "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日"
 "誌中。"
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "找不到日誌"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "瀏覽日誌目錄(_B)"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "全部日誌大小:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:368
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:370
+#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14187,6 +14267,7 @@
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
@@ -14198,12 +14279,13 @@
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
 "  -h, --help          顯示輔助訊息並離開\n"
+"  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
 "  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
 "哪些帳號,並使用逗號分隔) \n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:490
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14212,7 +14294,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
@@ -14225,48 +14307,51 @@
 "%swiki/DeveloperPages\n"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:337
+#  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
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "發信人"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, 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:520
+#: ../pidgin/gtknotify.c:526
 #, 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:951
+#: ../pidgin/gtknotify.c:965
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
+#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤:%s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1121
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -14313,109 +14398,119 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "執行指令(_X)"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "播放音效(_L)"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "瀏覽(_E)..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "執行指令(_X)"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "播放音效(_L)"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "瀏覽(_E)..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "預設"
+
 # XXX 要覆查 - 20061025
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "無法打開表情主題。"
 
-#: ../pidgin/gtkprefs.c:638
+#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "安裝主題檔"
+
+#: ../pidgin/gtkprefs.c:696
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -14423,257 +14518,261 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "圖示"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S):"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../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:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "隱藏即時訊息交談視窗"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "離開期間"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "分頁"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "在分頁上顯示關閉鍵(_U)"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "標籤位置(_P):"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "視窗上方"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "視窗左側"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "視窗右側"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../pidgin/gtkprefs.c:920
+#: ../pidgin/gtkprefs.c:997
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化所有新交談視窗(_Z)"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "字型"
 
 #  XXX 要覆查 - acli 20070614
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "使用主題指定的文件字型(_T)"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "使用主題指定的字型(_T)"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "交談用的字型(_F):"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "預設格式"
 
 # NOTE 這不是說明文,而是樣本本身,玩死人了 :P
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "這是一個樣本。假如您使用的協定支援格式化,送出訊息的式樣將會類似這段文字。"
 
-#: ../pidgin/gtkprefs.c:1054
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14682,80 +14781,80 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(預設)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "自動"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "指令"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14764,118 +14863,118 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "啟動音效:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "離開期間"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "事件"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "測試"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "重置"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
-msgstr "閒置多少分鐘設為離開(_M):"
-
-#: ../pidgin/gtkprefs.c:1888
+msgstr "閒置多少分鐘更改狀態(_M):"
+
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "音效"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -14899,63 +14998,63 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -14964,78 +15063,79 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1478
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1479
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1482
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1483
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "新增聊天室(_A)"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "您確定您要刪除被選取的狀態?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
 # TODO - 這個有點不妥,但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
@@ -15088,41 +15188,41 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄,您需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1517
 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."
@@ -15130,23 +15230,23 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1529
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15154,7 +15254,7 @@
 "您可以透過檔案傳輸,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用"
 "者。"
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1537
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15167,17 +15267,17 @@
 #. * 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:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 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:2268
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15188,45 +15288,38 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2564
+#: ../pidgin/gtkutils.c:2613
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2567
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2667
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "儲存檔案"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 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/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "別名(_A)"
@@ -15251,10 +15344,6 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "預設"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情圖示"
@@ -15313,18 +15402,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr "好友在線狀態預測"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr "好友在線狀態預測模組"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15433,11 +15522,24 @@
 msgid "Received Messages"
 msgstr "收到訊息"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 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 "忽略收到訊息中的自訂格式"
@@ -15558,31 +15660,31 @@
 msgstr "即時傳訊帳號"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "群組:"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "新增連絡人"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "選擇好友"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15592,13 +15694,13 @@
 
 # XXX 暫譯
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "使用者細節 (_D)"
 
 # XXX 暫譯
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
@@ -15659,33 +15761,33 @@
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "請在下面輸入這個使用者的資訊。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "請在下面輸入好友的帳號及其類別。"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "帳號類型:"
 
 #  NOTE 選擇性資訊
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "其他資訊:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "名:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "姓:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "電子郵件:"
 
@@ -15989,24 +16091,24 @@
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "選擇介面字型"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "選擇介面字型"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -16030,36 +16132,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "工具"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc檔專用工具"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
@@ -16083,20 +16185,20 @@
 "作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
 #: ../pidgin/plugins/relnot.c:71
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "您目前使用的 %s 版本為 %s,最新的版本是 %s。新版本可由以下網址取得:<a href="
-"\""
-
-#: ../pidgin/plugins/relnot.c:78
+"\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>功能說明:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "有新版本"
 
@@ -16106,19 +16208,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "新版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "不時查看有沒有新版本。"
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -16126,71 +16228,71 @@
 "不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
 
 # FIXME 譯文有譯改進 - 20061027
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "重覆的改正"
 
 # FIXME 譯文有譯改進 - 20061027
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "改正列表內經已存有您所指定的字詞。"
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "當您輸入"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "將會送出"
 
 # XXX 譯文有待改進 - 20061027
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "只匹配完整字詞"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "加入一個新的文字取代規則"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "當您輸入(_T):"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "將會送出(_S):"
 
 #  XXX 加「須」字意思較為清楚 - ambrose 20070415
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "大小寫須完全一致(不選取為自動大小寫處理)(_E)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "只取代完整的字(_W)"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "一般文字取代選項"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -16200,7 +16302,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "好友跑馬燈"
 
@@ -16208,7 +16310,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
@@ -16293,45 +16395,45 @@
 "timestamp formats."
 msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "即時訊息交談視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "即時訊息視窗透明度(_I)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "在即時訊息視窗取得焦點時移除透明度"
 
 # XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "總是在最上層"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "好友清單視窗透明度(_B)"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "取得輸入焦點時移除好友清單視窗透明度"
 
@@ -16341,19 +16443,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "交談視窗及好友清單產生的半透明效果。"
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16409,7 +16511,7 @@
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已登出。</font>"
 
@@ -16419,29 +16521,29 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP 監控器"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "帳號:"
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
 #  NOTE Jabber 的「stanza」譯「段落」,下同
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "插入 <presence/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "插入 <message/> 段落。"
 
@@ -16449,15 +16551,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+# NOTE 沒辦法,用不到着重號,又沒法改換字型……
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "尚未支援指令,訊息因此沒有被送出。"
+
+# NOTE 譯文更動 by Ambrose
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "無法取得使用者 %s 的個人資訊:"
+
+#~ msgid ""
+#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
+#~ "for this is that you have the maximum number of allowed buddies in your "
+#~ "buddy list."
+#~ msgstr ""
+#~ "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目"
+#~ "超過所系統允許的上限。"
+
+#~ msgid "_Connect"
+#~ msgstr "連線(_C)"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "送出即時訊息失敗\n"
+
+#~ msgid "Unavailable"
+#~ msgstr "離線"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/好友/關於 Pidgin(_A)"
+
+#~ msgid "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 "工具"
+
 #  TODO 譯文有待改進,這是意譯
 #~ msgid "Reject watching by other users"
 #~ msgstr "拒絕伺服器端的好友狀態捕捉"
@@ -16471,47 +16622,6 @@
 #~ msgid "Alias..."
 #~ msgstr "別名..."
 
-#, fuzzy
-#~ msgid "_Font"
-#~ msgstr "字型"
-
-#, fuzzy
-#~ msgid "_Bold"
-#~ msgstr "粗體"
-
-# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
-#, fuzzy
-#~ msgid "_Italic"
-#~ msgstr "斜體"
-
-#, fuzzy
-#~ msgid "_Underline"
-#~ msgstr "底線"
-
-#, fuzzy
-#~ msgid "_Normal"
-#~ msgstr "正常"
-
-#, fuzzy
-#~ msgid "_Smaller"
-#~ msgstr "儲存(_S)"
-
-#, fuzzy
-#~ msgid "_Reset font"
-#~ msgstr "清除格式化(_R)"
-
-#, fuzzy
-#~ msgid "_Smiley"
-#~ msgstr "笑一個!"
-
-#, fuzzy
-#~ msgid "_Image"
-#~ msgstr "儲存影像"
-
-#, fuzzy
-#~ msgid "_Link"
-#~ msgstr "登入(_L)"
-
 #~ msgid ""
 #~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
 #~ "pidgin.im</a>."
@@ -16526,15 +16636,6 @@
 #~ "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像"
 #~ "檔給這個使用者。"
 
-#~ msgid "/_Help"
-#~ msgstr "說明(_H)"
-
-#~ msgid "/Help/Online _Help"
-#~ msgstr "線上說明(_H)"
-
-#~ msgid "/Help/_About"
-#~ msgstr "/說明/關於(_A)"
-
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"