diff po/zh_TW.po @ 15595:8e3734ea23ba

commit these updated translations here also
author Luke Schierer <lschiere@pidgin.im>
date Fri, 09 Feb 2007 13:43:36 +0000
parents b7ae1464365c
children
line wrap: on
line diff
--- a/po/zh_TW.po	Fri Feb 09 13:42:33 2007 +0000
+++ b/po/zh_TW.po	Fri Feb 09 13:43:36 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2006, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
-# $InternalId: zh_TW.po,v 1.406 2006/10/30 05:59:52 acli Exp $
+# $InternalId: zh_TW.po,v 1.426 2006/11/24 03:12:10 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -13,6 +13,12 @@
 # XXX   表示可能有問題,要複查;有問題需討論
 # ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
 # ----------------------------------------------------------
+# 注意: screen name = user name = 帳號 = 使用者名稱
+#        screen name 和 user name 在意義上是沒有分別的!
+# 理據如下
+# (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
+# ----------------------------------------------------------
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
 # - Public Key 暫譯「公鑰」
@@ -43,8 +49,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 2.0.0\n"
-"POT-Creation-Date: 2006-10-29 00:00-0400\n"
-"PO-Revision-Date: 2006-10-29 23:16-0500\n"
+"POT-Creation-Date: 2006-11-23 00:00-0500\n"
+"PO-Revision-Date: 2006-11-23 22:11-0500\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -65,15 +71,15 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "透過多種通訊協定發送即時訊息"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:259
-#: ../console/gntblist.c:377 ../console/gntblist.c:390
+#: ../console/gntaccount.c:119 ../console/gntblist.c:271
+#: ../console/gntblist.c:389 ../console/gntblist.c:402
 #: ../console/gntplugin.c:169 ../console/gntplugin.c:214
 #: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/buddy.c:1366
 #: ../libgaim/protocols/jabber/chat.c:677
 #: ../libgaim/protocols/jabber/chat.c:688
-#: ../libgaim/protocols/jabber/jabber.c:1188
-#: ../libgaim/protocols/qq/group_join.c:322
+#: ../libgaim/protocols/jabber/jabber.c:1203
+#: ../libgaim/protocols/qq/group_join.c:324
 #: ../libgaim/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "錯誤"
@@ -87,15 +93,15 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "帳號不可留空。"
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:558
+#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:559
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:487
+#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:488
 msgid "Remember password"
 msgstr "記住密碼"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1400 ../gtk/gtkblist.c:3777
+#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1405 ../gtk/gtkblist.c:3801
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -104,79 +110,79 @@
 msgid "New Account"
 msgstr "新帳號"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:399 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:400 ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:404 ../gtk/gtkblist.c:4922
+#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:405 ../gtk/gtkblist.c:5029
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "帳號:"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:478
+#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:479
 msgid "Password:"
 msgstr "密碼:"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:4943 ../gtk/gtkblist.c:5308
+#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5050 ../gtk/gtkblist.c:5412
 msgid "Alias:"
 msgstr "別名:"
 
 #. Cancel
 #: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:300
-#: ../console/gntblist.c:367 ../console/gntblist.c:400
-#: ../console/gntblist.c:724 ../console/gntblist.c:893
-#: ../console/gntblist.c:984 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:471
-#: ../console/gntstatus.c:596 ../gtk/gtkaccount.c:1833
-#: ../gtk/gtkaccount.c:2303 ../gtk/gtkblist.c:5364 ../gtk/gtkdialogs.c:678
-#: ../gtk/gtkdialogs.c:815 ../gtk/gtkdialogs.c:906 ../gtk/gtkdialogs.c:925
-#: ../gtk/gtkdialogs.c:947 ../gtk/gtkdialogs.c:967 ../gtk/gtkdialogs.c:1011
-#: ../gtk/gtkdialogs.c:1049 ../gtk/gtkdialogs.c:1103 ../gtk/gtkdialogs.c:1140
-#: ../gtk/gtkdialogs.c:1165 ../gtk/gtkimhtmltoolbar.c:419
-#: ../gtk/gtkplugin.c:296 ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566
-#: ../gtk/gtkprivacy.c:579 ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615
-#: ../gtk/gtkrequest.c:270 ../gtk/gtksavedstatuses.c:296
-#: ../libgaim/account.c:964 ../libgaim/account.c:1135
-#: ../libgaim/account.c:1169 ../libgaim/conversation.c:1164
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1725
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../console/gntaccount.c:834 ../console/gntblist.c:312
+#: ../console/gntblist.c:379 ../console/gntblist.c:412
+#: ../console/gntblist.c:741 ../console/gntblist.c:910
+#: ../console/gntblist.c:1001 ../console/gntblist.c:2000
+#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
+#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
+#: ../gtk/gtkaccount.c:1841 ../gtk/gtkaccount.c:2360 ../gtk/gtkblist.c:5468
+#: ../gtk/gtkdialogs.c:683 ../gtk/gtkdialogs.c:820 ../gtk/gtkdialogs.c:911
+#: ../gtk/gtkdialogs.c:930 ../gtk/gtkdialogs.c:952 ../gtk/gtkdialogs.c:972
+#: ../gtk/gtkdialogs.c:1016 ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1108
+#: ../gtk/gtkdialogs.c:1145 ../gtk/gtkdialogs.c:1170
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
+#: ../gtk/gtkpounce.c:1092 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:959
+#: ../libgaim/account.c:1130 ../libgaim/account.c:1164
+#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:1728
+#: ../libgaim/protocols/jabber/buddy.c:1762
 #: ../libgaim/protocols/jabber/chat.c:780
-#: ../libgaim/protocols/jabber/jabber.c:850
-#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/jabber.c:858
+#: ../libgaim/protocols/jabber/jabber.c:1358
 #: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
 #: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
 #: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
-#: ../libgaim/protocols/oscar/oscar.c:1387
-#: ../libgaim/protocols/oscar/oscar.c:2151
-#: ../libgaim/protocols/oscar/oscar.c:2190
-#: ../libgaim/protocols/oscar/oscar.c:2238
-#: ../libgaim/protocols/oscar/oscar.c:5732
-#: ../libgaim/protocols/oscar/oscar.c:5784
-#: ../libgaim/protocols/oscar/oscar.c:5936
-#: ../libgaim/protocols/oscar/oscar.c:5961
-#: ../libgaim/protocols/oscar/oscar.c:6017
-#: ../libgaim/protocols/oscar/oscar.c:6086
+#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libgaim/protocols/oscar/oscar.c:2155
+#: ../libgaim/protocols/oscar/oscar.c:2194
+#: ../libgaim/protocols/oscar/oscar.c:2242
+#: ../libgaim/protocols/oscar/oscar.c:5754
+#: ../libgaim/protocols/oscar/oscar.c:5806
+#: ../libgaim/protocols/oscar/oscar.c:5958
+#: ../libgaim/protocols/oscar/oscar.c:5983
+#: ../libgaim/protocols/oscar/oscar.c:6039
+#: ../libgaim/protocols/oscar/oscar.c:6108
 #: ../libgaim/protocols/oscar/peer.c:991
-#: ../libgaim/protocols/qq/buddy_info.c:480
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/buddy_opt.c:400 ../libgaim/protocols/qq/group.c:122
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_join.c:357
-#: ../libgaim/protocols/qq/group_opt.c:140
-#: ../libgaim/protocols/qq/group_opt.c:390 ../libgaim/protocols/qq/qq.c:459
-#: ../libgaim/protocols/qq/sendqueue.c:201
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:3361
-#: ../libgaim/protocols/sametime/sametime.c:3446
-#: ../libgaim/protocols/sametime/sametime.c:3616
-#: ../libgaim/protocols/sametime/sametime.c:5311
-#: ../libgaim/protocols/sametime/sametime.c:5400
-#: ../libgaim/protocols/sametime/sametime.c:5524
+#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/group_join.c:138
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:142
+#: ../libgaim/protocols/qq/group_opt.c:392 ../libgaim/protocols/qq/qq.c:461
+#: ../libgaim/protocols/qq/sendqueue.c:203
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:3399
+#: ../libgaim/protocols/sametime/sametime.c:3484
+#: ../libgaim/protocols/sametime/sametime.c:3654
+#: ../libgaim/protocols/sametime/sametime.c:5402
+#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libgaim/protocols/sametime/sametime.c:5615
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
 #: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
@@ -191,12 +197,12 @@
 #. Save
 #: ../console/gntaccount.c:558 ../console/gntprefs.c:224
 #: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1168
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1163
 #: ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "儲存"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1827
+#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1835
 #: ../gtk/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -209,13 +215,13 @@
 
 #: ../console/gntaccount.c:615 ../console/gntaccount.c:681
 #: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1832 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtkaccount.c:1840 ../gtk/gtkpounce.c:1091 ../gtk/gtkrequest.c:273
 #: ../gtk/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "刪除"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1760
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2135 ../gtk/gtkdocklet.c:500
+#: ../console/gntaccount.c:644 ../console/gntblist.c:1921
+#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2192 ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -224,14 +230,14 @@
 msgstr "以下列表的帳號可隨意啟用、停用。"
 
 #: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:300 ../console/gntblist.c:367
-#: ../console/gntblist.c:400 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2302 ../gtk/gtkblist.c:5363
-#: ../gtk/gtkconv.c:1632 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2429
-#: ../libgaim/protocols/qq/sys_msg.c:102 ../libgaim/protocols/qq/sys_msg.c:157
-#: ../libgaim/protocols/qq/sys_msg.c:245
-#: ../libgaim/protocols/sametime/sametime.c:5399
+#: ../console/gntblist.c:312 ../console/gntblist.c:379
+#: ../console/gntblist.c:412 ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2359 ../gtk/gtkblist.c:5467
+#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2433
+#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:247
+#: ../libgaim/protocols/sametime/sametime.c:5490
 #: ../libgaim/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "加入"
@@ -240,55 +246,55 @@
 msgid "Modify"
 msgstr "修改"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2251
+#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2308
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2300
+#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2357
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
-#: ../console/gntblist.c:251
+#: ../console/gntblist.c:263
 msgid "You must provide a screename for the buddy."
 msgstr "必須為好友指定帳號。"
 
-#: ../console/gntblist.c:253
+#: ../console/gntblist.c:265
 msgid "You must provide a group."
 msgstr "必須為好友指定群組。"
 
-#: ../console/gntblist.c:255
+#: ../console/gntblist.c:267
 msgid "You must select an account."
 msgstr "必須指定帳號"
 
-#: ../console/gntblist.c:259
+#: ../console/gntblist.c:271
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../console/gntblist.c:284 ../gtk/gtkaccount.c:1896
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2803
+#: ../console/gntblist.c:296 ../gtk/gtkaccount.c:1904
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2807
 msgid "Screen Name"
 msgstr "帳號"
 
-#: ../console/gntblist.c:287 ../console/gntblist.c:359 ../gtk/gtkdialogs.c:924
-#: ../gtk/gtkdialogs.c:946 ../gtk/gtkdialogs.c:966 ../gtk/gtkrequest.c:277
+#: ../console/gntblist.c:299 ../console/gntblist.c:371 ../gtk/gtkdialogs.c:929
+#: ../gtk/gtkdialogs.c:951 ../gtk/gtkdialogs.c:971 ../gtk/gtkrequest.c:277
 #: ../libgaim/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "別名"
 
-#: ../console/gntblist.c:290 ../console/gntblist.c:362
+#: ../console/gntblist.c:302 ../console/gntblist.c:374
 msgid "Group"
 msgstr "群組"
 
-#: ../console/gntblist.c:293 ../console/gntblist.c:350
+#: ../console/gntblist.c:305 ../console/gntblist.c:362
 #: ../console/gntnotify.c:155 ../console/gntstatus.c:562
-#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1255
-#: ../gtk/plugins/gevolution/gevolution.c:451 ../libgaim/plugins/idle.c:153
+#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1259
+#: ../gtk/plugins/gevolution/gevolution.c:444 ../libgaim/plugins/idle.c:153
 #: ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "帳號"
 
-#: ../console/gntblist.c:299 ../console/gntblist.c:771 ../gtk/gtkblist.c:4876
+#: ../console/gntblist.c:311 ../console/gntblist.c:788 ../gtk/gtkblist.c:4983
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
@@ -299,11 +305,11 @@
 msgstr "新增好友"
 
 # TODO 要覆查 - 20061025
-#: ../console/gntblist.c:299
+#: ../console/gntblist.c:311
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../console/gntblist.c:322 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:334 ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "聊天"
 
@@ -312,146 +318,149 @@
 #. Contact Info
 #. Personal
 #. Business
-#: ../console/gntblist.c:356 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:368 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
 #: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:781
+#: ../libgaim/protocols/jabber/jabber.c:789
 #: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
-#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "名稱"
 
-#: ../console/gntblist.c:365 ../console/gntblist.c:773 ../gtk/gtkblist.c:5254
+#: ../console/gntblist.c:377 ../console/gntblist.c:790 ../gtk/gtkblist.c:5358
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: ../console/gntblist.c:366
+#: ../console/gntblist.c:378
 msgid "You can edit more information from the context menu later."
 msgstr "如果要繼續修改其他細節,請用快顯選單。"
 
-#: ../console/gntblist.c:377 ../console/gntblist.c:390
+#: ../console/gntblist.c:389 ../console/gntblist.c:402
 msgid "Error adding group"
 msgstr "新增群組途中發生了錯誤"
 
-#: ../console/gntblist.c:378
+#: ../console/gntblist.c:390
 msgid "You must give a name for the group to add."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../console/gntblist.c:391
+#: ../console/gntblist.c:403
 msgid "A group with the name already exists."
 msgstr "那個群組已經存在"
 
 # TODO 請覆查核實:是「加入」抑或「新增」?
-#: ../console/gntblist.c:398 ../console/gntblist.c:775 ../gtk/gtkblist.c:5360
-#: ../libgaim/protocols/sametime/sametime.c:5310
-#: ../libgaim/protocols/sametime/sametime.c:5397
+#: ../console/gntblist.c:410 ../console/gntblist.c:792 ../gtk/gtkblist.c:5464
+#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libgaim/protocols/sametime/sametime.c:5488
 msgid "Add Group"
 msgstr "加入群組"
 
 # TODO 要覆查 - 20061026
-#: ../console/gntblist.c:398
+#: ../console/gntblist.c:410
 msgid "Enter the name of the group"
 msgstr "請給群組輸入名稱。"
 
-#: ../console/gntblist.c:723
+#: ../console/gntblist.c:740
 msgid "Edit Chat"
 msgstr "修改聊天室"
 
-#: ../console/gntblist.c:723
+#: ../console/gntblist.c:740
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
 # TODO 要覆查 - 20061025
-#: ../console/gntblist.c:724 ../console/gntstatus.c:196
+#: ../console/gntblist.c:741 ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "修改"
 
-#: ../console/gntblist.c:738
+#: ../console/gntblist.c:755
 msgid "Auto-join"
 msgstr "自動加入"
 
 # XXX 還是「修改選項」?
-#: ../console/gntblist.c:747
+#: ../console/gntblist.c:764
 msgid "Edit Settings"
 msgstr "修改設定"
 
-#: ../console/gntblist.c:793 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:810 ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: ../console/gntblist.c:798
+#: ../console/gntblist.c:815
 msgid "Add Buddy Pounce"
 msgstr "加入好友狀態捕捉"
 
-#: ../console/gntblist.c:805 ../gtk/gtkconv.c:1580
-#: ../libgaim/protocols/oscar/oscar.c:615
+#: ../console/gntblist.c:822 ../gtk/gtkconv.c:1582
+#: ../libgaim/protocols/oscar/oscar.c:617
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../console/gntblist.c:809
+#: ../console/gntblist.c:826
 msgid "View Log"
 msgstr "觀看日誌"
 
-#: ../console/gntblist.c:889
+#: ../console/gntblist.c:906
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "請輸入 %s 的新密碼"
 
-#: ../console/gntblist.c:891 ../console/gntblist.c:892
-#: ../console/gntblist.c:1061
+#: ../console/gntblist.c:908 ../console/gntblist.c:909
+#: ../console/gntblist.c:1117
 msgid "Rename"
 msgstr "重命名"
 
 # FIXME 譯文有待改進 - 20061029
-#: ../console/gntblist.c:891
+#: ../console/gntblist.c:908
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
 
-#: ../console/gntblist.c:964
+#: ../console/gntblist.c:981
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "移除這組好友會同時移除裏面的所有好友"
 
-#: ../console/gntblist.c:972
+#: ../console/gntblist.c:989
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "移除這個群組會同時移除裏面的所有好友"
 
-#: ../console/gntblist.c:977
+#: ../console/gntblist.c:994
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "您確定要刪除 %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:980
+#: ../console/gntblist.c:997
 msgid "Confirm Remove"
 msgstr "確認移除"
 
-#: ../console/gntblist.c:983 ../console/gntblist.c:1063 ../gtk/gtkblist.c:1039
-#: ../gtk/gtkconv.c:1629 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:1000 ../console/gntblist.c:1119
+#: ../gtk/gtkblist.c:1036 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../gtk/gtkstatusbox.c:245
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../console/gntblist.c:1038 ../console/gntblist.c:1872
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3894
+#: ../console/gntblist.c:1094 ../console/gntblist.c:2067
+#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3969
 #: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: ../console/gntblist.c:1067
-#, fuzzy
+# 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
+#: ../console/gntblist.c:1124
 msgid "Place tagged"
-msgstr "成功為空間加標記"
-
-#: ../console/gntblist.c:1070
-msgid "Tag"
-msgstr "標記"
-
-#: ../console/gntblist.c:1097 ../console/gntblist.c:1198
+msgstr "移動已標記的項目"
+
+# FIXME - 20061122
+#: ../console/gntblist.c:1129
+msgid "Toggle Tag"
+msgstr "切換標記"
+
+#: ../console/gntblist.c:1156 ../console/gntblist.c:1275
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "帳號:%s (%s)"
 
-#: ../console/gntblist.c:1122
+#: ../console/gntblist.c:1181
 #, c-format
 msgid ""
 "\n"
@@ -460,12 +469,12 @@
 "\n"
 "閒置:%s"
 
-#: ../console/gntblist.c:1177
+#: ../console/gntblist.c:1238 ../console/gntblist.c:1254
 #, c-format
 msgid "Nickname: %s\n"
 msgstr "暱稱:%s\n"
 
-#: ../console/gntblist.c:1189
+#: ../console/gntblist.c:1266
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -474,7 +483,7 @@
 "上線:%d 人\n"
 "總數:%d 人"
 
-#: ../console/gntblist.c:1210
+#: ../console/gntblist.c:1287
 #, c-format
 msgid ""
 "\n"
@@ -484,37 +493,93 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../console/gntblist.c:1433 ../gtk/gtkdocklet.c:448
-#: ../gtk/gtkstatusbox.c:984
+#: ../console/gntblist.c:1536 ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkstatusbox.c:1008
 msgid "New..."
 msgstr "新增..."
 
 # NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
-# NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能「其他」已足夠
-#: ../console/gntblist.c:1440 ../gtk/gtkdocklet.c:449
-#: ../gtk/gtkstatusbox.c:985
+# NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
+#: ../console/gntblist.c:1543 ../gtk/gtkdocklet.c:492
+#: ../gtk/gtkstatusbox.c:1009
 msgid "Saved..."
-msgstr "其他..."
+msgstr "狀態清單..."
+
+#: ../console/gntblist.c:1889 ../console/gntplugin.c:231 ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:538
+msgid "Plugins"
+msgstr "模組清單"
+
+# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
+#: ../console/gntblist.c:1981 ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801
+#: ../gtk/gtkdialogs.c:881
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../console/gntblist.c:1986 ../gtk/gtkdialogs.c:669 ../gtk/gtkdialogs.c:806
+#: ../gtk/gtkdialogs.c:886
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: ../console/gntblist.c:1994 ../gtk/gtkdialogs.c:677
+msgid "New Instant Message"
+msgstr "新即時訊息"
+
+#: ../console/gntblist.c:1996 ../gtk/gtkdialogs.c:679
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "請輸入您所想要發送即時訊息對象的帳號。"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntblist.c:1999 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3800
+#: ../gtk/gtkdialogs.c:682 ../gtk/gtkdialogs.c:819 ../gtk/gtkdialogs.c:910
+#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:958 ../libgaim/account.c:1129
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1390
+#: ../libgaim/protocols/oscar/oscar.c:2154
+#: ../libgaim/protocols/oscar/oscar.c:2241
+#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libgaim/protocols/oscar/oscar.c:5957
+#: ../libgaim/protocols/oscar/oscar.c:5982
+#: ../libgaim/protocols/oscar/oscar.c:6038
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:749
+#: ../libgaim/protocols/yahoo/yahoo.c:3213
+#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "確定"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:1830 ../gtk/gtkpounce.c:766
+#: ../console/gntblist.c:2018 ../gtk/gtkpounce.c:770
 msgid "Options"
 msgstr "選項"
 
+#: ../console/gntblist.c:2024
+msgid "Send IM..."
+msgstr "送出即時訊息..."
+
 # FIXME 譯文有待改進 - 20061028
-#: ../console/gntblist.c:1836
+#: ../console/gntblist.c:2028
 msgid "Toggle offline buddies"
 msgstr "顯示/不顯示離線好友"
 
-#: ../console/gntblist.c:1840
+#: ../console/gntblist.c:2032
 msgid "Sort by status"
 msgstr "依照狀態排列"
 
-#: ../console/gntblist.c:1844
+#: ../console/gntblist.c:2036
 msgid "Sort alphabetically"
 msgstr "依照字母排列"
 
-#: ../console/gntblist.c:1848
+#: ../console/gntblist.c:2040
 msgid "Sort by log size"
 msgstr "依照日誌大小排列"
 
@@ -537,32 +602,32 @@
 "%s 因下列錯誤結束了連線:\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3774 ../libgaim/account.c:991
+#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3798 ../libgaim/account.c:986
 #: ../libgaim/connection.c:107
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../console/gntconv.c:71 ../gtk/gtkconv.c:484
+#: ../console/gntconv.c:71
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:491
+#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:496
+#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:502
+#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:505
+#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:509
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
@@ -572,34 +637,34 @@
 msgstr "尚未支援指令,訊息因此沒有被送出。"
 
 # XXX 這是什麼?
-#: ../console/gntconv.c:196
+#: ../console/gntconv.c:198
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../console/gntconv.c:217
+#: ../console/gntconv.c:219
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../console/gntconv.c:347
+#: ../console/gntconv.c:349
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../console/gntconv.c:441
+#: ../console/gntconv.c:443
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../console/gntconv.c:565 ../gtk/gtkconv.c:378
+#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../console/gntconv.c:600 ../gtk/gtkconv.c:414
+#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../console/gntconv.c:603 ../gtk/gtkconv.c:417
+#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -607,57 +672,57 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../console/gntconv.c:642 ../gtk/gtkconv.c:6645
+#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6737
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../console/gntconv.c:645 ../gtk/gtkconv.c:6648
+#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6740
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../console/gntconv.c:648 ../gtk/gtkconv.c:6651
+#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6743
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../console/gntconv.c:651 ../gtk/gtkconv.c:6654
+#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6746
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../console/gntconv.c:654 ../gtk/gtkconv.c:6657
+#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6749
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: ../console/gntconv.c:659
+#: ../console/gntconv.c:661
 msgid "plugins: Show the plugins window."
 msgstr "plugins:顯示「模組」視窗"
 
-#: ../console/gntconv.c:662
+#: ../console/gntconv.c:664
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:顯示好友清單。"
 
-#: ../console/gntconv.c:665
+#: ../console/gntconv.c:667
 msgid "accounts: Show the accounts window."
 msgstr "accounts:顯示帳號清單。"
 
-#: ../console/gntconv.c:668
+#: ../console/gntconv.c:670
 msgid "debugwin: Show the debug window."
 msgstr "debugwin:顯示除錯視窗"
 
-#: ../console/gntconv.c:671
+#: ../console/gntconv.c:673
 msgid "prefs: Show the preference window."
 msgstr "prefs:顯示「偏好設定」視窗"
 
 # FIXME - 20061028
-#: ../console/gntconv.c:674
+#: ../console/gntconv.c:676
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses:「已儲存的狀態」視窗"
 
-#: ../console/gntdebug.c:203 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -665,15 +730,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.
 #.
-#: ../console/gntdebug.c:220 ../gtk/gtkdebug.c:767
+#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "清除"
 
-#: ../console/gntdebug.c:225 ../gtk/gtkdebug.c:776
+#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "暫停"
 
-#: ../console/gntdebug.c:230 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "時間戳記"
 
@@ -703,33 +768,6 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntnotify.c:79 ../gtk/gtkblist.c:3776 ../gtk/gtkdialogs.c:677
-#: ../gtk/gtkdialogs.c:814 ../gtk/gtkdialogs.c:905 ../gtk/gtkrequest.c:269
-#: ../libgaim/account.c:963 ../libgaim/account.c:1134
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1342
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1386
-#: ../libgaim/protocols/oscar/oscar.c:2150
-#: ../libgaim/protocols/oscar/oscar.c:2237
-#: ../libgaim/protocols/oscar/oscar.c:5731
-#: ../libgaim/protocols/oscar/oscar.c:5935
-#: ../libgaim/protocols/oscar/oscar.c:5960
-#: ../libgaim/protocols/oscar/oscar.c:6016
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:749
-#: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
-msgid "OK"
-msgstr "確定"
-
 #: ../console/gntnotify.c:146
 msgid "Emails"
 msgstr "電子郵件"
@@ -742,7 +780,7 @@
 # FIXME check - 20061025
 #  NOTE Jabber 術語,見上
 #: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
-#: ../libgaim/protocols/jabber/jabber.c:1138
+#: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From"
 msgstr "已認證對方"
 
@@ -769,7 +807,7 @@
 msgstr "新郵件"
 
 #: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
-#: ../libgaim/protocols/oscar/oscar.c:2610
+#: ../libgaim/protocols/oscar/oscar.c:2614
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
@@ -786,11 +824,11 @@
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 # XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1608 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "資訊"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1569
+#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
 msgid "IM"
 msgstr "即時訊息"
 
@@ -798,7 +836,7 @@
 msgid "Join"
 msgstr "加入"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3445
+#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3483
 msgid "Invite"
 msgstr "邀請"
 
@@ -840,11 +878,6 @@
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
-#: ../console/gntplugin.c:231 ../console/gntui.c:73 ../gtk/gtkdocklet.c:501
-#: ../gtk/gtkplugin.c:538
-msgid "Plugins"
-msgstr "模組清單"
-
 #: ../console/gntplugin.c:236
 msgid "You can (un)load plugins from the following list."
 msgstr "您可透過以下列表載入或卸載模組。"
@@ -886,17 +919,17 @@
 msgstr "記錄所有的狀態改變"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:822 ../gtk/gtkprefs.c:1888
+#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
 #: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
 msgstr "交談"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1318 ../gtk/gtkprefs.c:1899
+#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
 msgid "Logging"
 msgstr "日誌"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:502
-#: ../gtk/gtkprefs.c:1924
+#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../gtk/gtkprefs.c:1945
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -916,12 +949,12 @@
 # FIXME 譯得太差了
 #: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
 msgid "Saved Statuses"
-msgstr "已儲存的狀態"
+msgstr "狀態清單"
 
 # FIXME 原文一詞兩義,根本無法翻譯
 #: ../console/gntstatus.c:174 ../console/gntstatus.c:525
 #: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libgaim/protocols/jabber/buddy.c:920
 #: ../libgaim/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "職銜"
@@ -935,31 +968,31 @@
 #: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
 #: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1592 ../libgaim/protocols/gg/gg.c:1602
-#: ../libgaim/protocols/gg/gg.c:1608 ../libgaim/protocols/gg/gg.c:1617
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1205
-#: ../libgaim/protocols/jabber/jabber.c:1215
-#: ../libgaim/protocols/jabber/jabber.c:1225
-#: ../libgaim/protocols/jabber/jabber.c:1235
-#: ../libgaim/protocols/jabber/jabber.c:1245
-#: ../libgaim/protocols/jabber/jabber.c:1257
+#: ../libgaim/protocols/gg/gg.c:1598 ../libgaim/protocols/gg/gg.c:1608
+#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/gg/gg.c:1623
+#: ../libgaim/protocols/gg/gg.c:1628 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/jabber/jabber.c:1220
+#: ../libgaim/protocols/jabber/jabber.c:1230
+#: ../libgaim/protocols/jabber/jabber.c:1240
+#: ../libgaim/protocols/jabber/jabber.c:1250
+#: ../libgaim/protocols/jabber/jabber.c:1260
+#: ../libgaim/protocols/jabber/jabber.c:1272
 #: ../libgaim/protocols/novell/novell.c:2876
 #: ../libgaim/protocols/novell/novell.c:2982
 #: ../libgaim/protocols/novell/novell.c:2988
 #: ../libgaim/protocols/novell/novell.c:2994
-#: ../libgaim/protocols/oscar/oscar.c:5395
-#: ../libgaim/protocols/oscar/oscar.c:5410
-#: ../libgaim/protocols/oscar/oscar.c:5415
-#: ../libgaim/protocols/oscar/oscar.c:5623
-#: ../libgaim/protocols/oscar/oscar.c:5635
-#: ../libgaim/protocols/oscar/oscar.c:5648
-#: ../libgaim/protocols/oscar/oscar.c:5655
-#: ../libgaim/protocols/oscar/oscar.c:5662
-#: ../libgaim/protocols/sametime/sametime.c:3259
-#: ../libgaim/protocols/sametime/sametime.c:3265
-#: ../libgaim/protocols/sametime/sametime.c:3271
-#: ../libgaim/protocols/sametime/sametime.c:3350
+#: ../libgaim/protocols/oscar/oscar.c:5417
+#: ../libgaim/protocols/oscar/oscar.c:5432
+#: ../libgaim/protocols/oscar/oscar.c:5437
+#: ../libgaim/protocols/oscar/oscar.c:5645
+#: ../libgaim/protocols/oscar/oscar.c:5657
+#: ../libgaim/protocols/oscar/oscar.c:5670
+#: ../libgaim/protocols/oscar/oscar.c:5677
+#: ../libgaim/protocols/oscar/oscar.c:5684
+#: ../libgaim/protocols/sametime/sametime.c:3297
+#: ../libgaim/protocols/sametime/sametime.c:3303
+#: ../libgaim/protocols/sametime/sametime.c:3309
+#: ../libgaim/protocols/sametime/sametime.c:3388
 #: ../libgaim/protocols/silc/buddy.c:1544
 #: ../libgaim/protocols/simple/simple.c:246
 #: ../libgaim/protocols/yahoo/yahoo.c:3456
@@ -994,7 +1027,7 @@
 msgstr "子狀態"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:4970 ../gtk/gtkblist.c:5288
+#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:5077 ../gtk/gtkblist.c:5392
 msgid "Account:"
 msgstr "帳號:"
 
@@ -1012,17 +1045,17 @@
 
 #: ../console/gntstatus.c:533 ../console/gntstatus.c:562
 #: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1575
-#: ../libgaim/protocols/gg/gg.c:1579 ../libgaim/protocols/jabber/buddy.c:623
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1581
+#: ../libgaim/protocols/gg/gg.c:1585 ../libgaim/protocols/jabber/buddy.c:623
 #: ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:658
-#: ../libgaim/protocols/jabber/jabber.c:1176
+#: ../libgaim/protocols/jabber/buddy.c:659
+#: ../libgaim/protocols/jabber/jabber.c:1191
 #: ../libgaim/protocols/msn/msn.c:546
 #: ../libgaim/protocols/novell/novell.c:2875
 #: ../libgaim/protocols/novell/novell.c:2879
-#: ../libgaim/protocols/oscar/oscar.c:759
-#: ../libgaim/protocols/oscar/oscar.c:765
-#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/oscar/oscar.c:761
+#: ../libgaim/protocols/oscar/oscar.c:767
+#: ../libgaim/protocols/oscar/oscar.c:770
 #: ../libgaim/protocols/yahoo/yahoo.c:3032
 msgid "Status"
 msgstr "狀態"
@@ -1164,7 +1197,7 @@
 msgstr "別名(_A)"
 
 #. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1120 ../gtk/gtkroomlist.c:285
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1117 ../gtk/gtkroomlist.c:285
 #: ../gtk/gtkroomlist.c:442
 msgid "_Join"
 msgstr "加入(_J)"
@@ -1173,7 +1206,7 @@
 msgid "Close _tabs"
 msgstr "關閉分頁(_T)"
 
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1004
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1001
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
@@ -1199,55 +1232,55 @@
 msgstr "暫停(_P)"
 
 #. Build the login options frame.
-#: ../gtk/gtkaccount.c:382
+#: ../gtk/gtkaccount.c:383
 msgid "Login Options"
 msgstr "登入選項"
 
 # NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../gtk/gtkaccount.c:483
+#: ../gtk/gtkaccount.c:484
 msgid "Local alias:"
 msgstr "帳號別名(只在本機生效):"
 
 #. Build the user options frame.
-#: ../gtk/gtkaccount.c:545
+#: ../gtk/gtkaccount.c:546
 msgid "User Options"
 msgstr "使用者自定選項"
 
 #. Buddy icon
-#: ../gtk/gtkaccount.c:563
+#: ../gtk/gtkaccount.c:564
 msgid "Use this buddy icon for this account:"
 msgstr "使用下列好友圖示:"
 
 #. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:671
+#: ../gtk/gtkaccount.c:672
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../gtk/gtkaccount.c:867
+#: ../gtk/gtkaccount.c:868
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../gtk/gtkaccount.c:873
+#: ../gtk/gtkaccount.c:874
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../gtk/gtkaccount.c:879
+#: ../gtk/gtkaccount.c:880
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../gtk/gtkaccount.c:885
+#: ../gtk/gtkaccount.c:886
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../gtk/gtkaccount.c:891
+#: ../gtk/gtkaccount.c:892
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:897 ../gtk/gtkprefs.c:1065
+#: ../gtk/gtkaccount.c:898 ../gtk/gtkprefs.c:1095
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -1256,270 +1289,291 @@
 #. 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.
-#: ../gtk/gtkaccount.c:936
+#: ../gtk/gtkaccount.c:937
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:939
+#: ../gtk/gtkaccount.c:940
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../gtk/gtkaccount.c:960
+#: ../gtk/gtkaccount.c:961
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../gtk/gtkaccount.c:974 ../gtk/gtkprefs.c:1059
+#: ../gtk/gtkaccount.c:975 ../gtk/gtkprefs.c:1089
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../gtk/gtkaccount.c:983 ../gtk/gtkprefs.c:1080
+#: ../gtk/gtkaccount.c:984 ../gtk/gtkprefs.c:1110
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../gtk/gtkaccount.c:987 ../gtk/gtkprefs.c:1098
+#: ../gtk/gtkaccount.c:988 ../gtk/gtkprefs.c:1128
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../gtk/gtkaccount.c:995
+#: ../gtk/gtkaccount.c:996
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../gtk/gtkaccount.c:1001 ../gtk/gtkprefs.c:1135
+#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1165
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../gtk/gtkaccount.c:1398
+#: ../gtk/gtkaccount.c:1403
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../gtk/gtkaccount.c:1422
+#: ../gtk/gtkaccount.c:1427
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../gtk/gtkaccount.c:1433
+#: ../gtk/gtkaccount.c:1438
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1448 ../libgaim/protocols/jabber/jabber.c:849
+#: ../gtk/gtkaccount.c:1453 ../libgaim/protocols/jabber/jabber.c:857
 msgid "Register"
 msgstr "註冊"
 
-#: ../gtk/gtkaccount.c:1919 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1927 ../gtk/gtkplugin.c:576
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkaccount.c:1935
 msgid "Protocol"
 msgstr "通訊協定"
 
+#: ../gtk/gtkaccount.c:2078
+msgid ""
+"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with Gaim press the "
+"<b>Add</b> button below and configure your first account. If you want Gaim "
+"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<span size='larger' weight='bold'>歡迎使用 Gaim!</span>\n"
+"\n"
+"您尚未設定任何即時通訊的帳號。要使用 Gaim 來通訊,請先按下面的「加入」按紐,"
+"再設定好您的帳號即可。如果您希望使用多個即時通訊帳號,可在完成上一步後,繼續"
+"按「加入」按紐來設定其他的帳號。\n"
+"\n"
+"您如果希望新增、修改或刪除帳號,只要透過好友清單上的「帳號→新增/編輯」指令,"
+"即可返回這個畫面。"
+
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: ../gtk/gtkblist.c:705
+#: ../gtk/gtkblist.c:702
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: ../gtk/gtkblist.c:726
+#: ../gtk/gtkblist.c:723
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../gtk/gtkblist.c:737 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:734 ../gtk/gtkpounce.c:527 ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../gtk/gtkblist.c:1001
+#: ../gtk/gtkblist.c:998
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../gtk/gtkblist.c:1010
+#: ../gtk/gtkblist.c:1007
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: ../gtk/gtkblist.c:1017
+#: ../gtk/gtkblist.c:1014
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: ../gtk/gtkblist.c:1021 ../gtk/gtkblist.c:1025 ../gtk/gtkblist.c:1124
-#: ../gtk/gtkblist.c:1147
+#: ../gtk/gtkblist.c:1018 ../gtk/gtkblist.c:1022 ../gtk/gtkblist.c:1121
+#: ../gtk/gtkblist.c:1144
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkblist.c:1033
 msgid "Alias..."
 msgstr "別名..."
 
-#: ../gtk/gtkblist.c:1045 ../gtk/gtkblist.c:1132 ../gtk/gtkblist.c:1153
+#: ../gtk/gtkblist.c:1042 ../gtk/gtkblist.c:1129 ../gtk/gtkblist.c:1150
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../gtk/gtkblist.c:1047 ../gtk/gtkblist.c:1134 ../gtk/gtkblist.c:1155
+#: ../gtk/gtkblist.c:1044 ../gtk/gtkblist.c:1131 ../gtk/gtkblist.c:1152
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../gtk/gtkblist.c:1095
+#: ../gtk/gtkblist.c:1092
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: ../gtk/gtkblist.c:1097
+#: ../gtk/gtkblist.c:1094
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: ../gtk/gtkblist.c:1100
+#: ../gtk/gtkblist.c:1097
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: ../gtk/gtkblist.c:1102
+#: ../gtk/gtkblist.c:1099
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../gtk/gtkblist.c:1122
+#: ../gtk/gtkblist.c:1119
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../gtk/gtkblist.c:1160 ../gtk/gtkblist.c:1183
+#: ../gtk/gtkblist.c:1157 ../gtk/gtkblist.c:1180
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../gtk/gtkblist.c:1188
+#: ../gtk/gtkblist.c:1185
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:1446 ../gtk/gtkblist.c:4095
-#: ../gtk/gtkblist.c:4105
+#: ../gtk/gtkblist.c:1431 ../gtk/gtkblist.c:1443 ../gtk/gtkblist.c:4202
+#: ../gtk/gtkblist.c:4212
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: ../gtk/gtkblist.c:1906 ../gtk/gtkconv.c:4277 ../gtk/gtkpounce.c:422
+#: ../gtk/gtkblist.c:1903 ../gtk/gtkconv.c:4350 ../gtk/gtkpounce.c:419
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../gtk/gtkblist.c:2480
+#: ../gtk/gtkblist.c:2497
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../gtk/gtkblist.c:2481
+#: ../gtk/gtkblist.c:2498
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../gtk/gtkblist.c:2482
+#: ../gtk/gtkblist.c:2499
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../gtk/gtkblist.c:2483
+#: ../gtk/gtkblist.c:2500
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../gtk/gtkblist.c:2484
+#: ../gtk/gtkblist.c:2501
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../gtk/gtkblist.c:2486
+#: ../gtk/gtkblist.c:2503
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: ../gtk/gtkblist.c:2487
+#: ../gtk/gtkblist.c:2504
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: ../gtk/gtkblist.c:2488
+#: ../gtk/gtkblist.c:2505
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: ../gtk/gtkblist.c:2489
+#: ../gtk/gtkblist.c:2506
 msgid "/Buddies/Show Idle _Times"
 msgstr "/好友/顯示閒置時間(_T)"
 
-#: ../gtk/gtkblist.c:2490
+#: ../gtk/gtkblist.c:2507
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../gtk/gtkblist.c:2492
+#: ../gtk/gtkblist.c:2509
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../gtk/gtkblist.c:2493
+#: ../gtk/gtkblist.c:2510
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../gtk/gtkblist.c:2494
+#: ../gtk/gtkblist.c:2511
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: ../gtk/gtkblist.c:2496
+#: ../gtk/gtkblist.c:2513
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../gtk/gtkblist.c:2499
+#: ../gtk/gtkblist.c:2516
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../gtk/gtkblist.c:2500 ../gtk/gtkblist.c:5947
+#: ../gtk/gtkblist.c:2517 ../gtk/gtkblist.c:6052
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: ../gtk/gtkblist.c:2503
+#: ../gtk/gtkblist.c:2520
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../gtk/gtkblist.c:2504
+#: ../gtk/gtkblist.c:2521
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../gtk/gtkblist.c:2505
+#: ../gtk/gtkblist.c:2522
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../gtk/gtkblist.c:2506
+#: ../gtk/gtkblist.c:2523
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../gtk/gtkblist.c:2507
+#: ../gtk/gtkblist.c:2524
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: ../gtk/gtkblist.c:2509
+#: ../gtk/gtkblist.c:2526
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../gtk/gtkblist.c:2510
+#: ../gtk/gtkblist.c:2527
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../gtk/gtkblist.c:2511
+#: ../gtk/gtkblist.c:2528
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../gtk/gtkblist.c:2513
+#: ../gtk/gtkblist.c:2530
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../gtk/gtkblist.c:2516
+#: ../gtk/gtkblist.c:2533
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: ../gtk/gtkblist.c:2517
+#: ../gtk/gtkblist.c:2534
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: ../gtk/gtkblist.c:2518
+#: ../gtk/gtkblist.c:2535
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../gtk/gtkblist.c:2519
+#: ../gtk/gtkblist.c:2536
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../gtk/gtkblist.c:2551 ../gtk/gtkblist.c:2620
+#: ../gtk/gtkblist.c:2568 ../gtk/gtkblist.c:2637
 #, c-format
 msgid ""
 "\n"
@@ -1528,7 +1582,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../gtk/gtkblist.c:2632
+#: ../gtk/gtkblist.c:2649
 #, c-format
 msgid ""
 "\n"
@@ -1537,7 +1591,7 @@
 "\n"
 "<b>好友別名:</b>%s"
 
-#: ../gtk/gtkblist.c:2644
+#: ../gtk/gtkblist.c:2661
 #, c-format
 msgid ""
 "\n"
@@ -1546,7 +1600,7 @@
 "\n"
 "<b>暱稱:</b>%s"
 
-#: ../gtk/gtkblist.c:2653
+#: ../gtk/gtkblist.c:2670
 #, c-format
 msgid ""
 "\n"
@@ -1555,7 +1609,7 @@
 "\n"
 "<b>登入時間:</b>%s"
 
-#: ../gtk/gtkblist.c:2664
+#: ../gtk/gtkblist.c:2681
 #, c-format
 msgid ""
 "\n"
@@ -1564,7 +1618,7 @@
 "\n"
 "<b>閒置:</b>%s"
 
-#: ../gtk/gtkblist.c:2699
+#: ../gtk/gtkblist.c:2716
 #, c-format
 msgid ""
 "\n"
@@ -1573,7 +1627,7 @@
 "\n"
 "<b>最後見到:</b>%s 前"
 
-#: ../gtk/gtkblist.c:2708
+#: ../gtk/gtkblist.c:2725
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -1581,7 +1635,7 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: ../gtk/gtkblist.c:2719
+#: ../gtk/gtkblist.c:2736
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -1589,7 +1643,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: ../gtk/gtkblist.c:2721
+#: ../gtk/gtkblist.c:2738
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -1597,7 +1651,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: ../gtk/gtkblist.c:2723
+#: ../gtk/gtkblist.c:2740
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -1605,146 +1659,173 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: ../gtk/gtkblist.c:3190 ../gtk/gtkdocklet.c:428 ../gtk/gtkstatusbox.c:974
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1365
+#: ../gtk/gtkblist.c:3207 ../gtk/gtkdocklet.c:471 ../gtk/gtkstatusbox.c:998
+#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1368
 #: ../libgaim/protocols/novell/novell.c:2865
-#: ../libgaim/protocols/oscar/oscar.c:769
-#: ../libgaim/protocols/oscar/oscar.c:5445
+#: ../libgaim/protocols/oscar/oscar.c:771
+#: ../libgaim/protocols/oscar/oscar.c:5467
 #: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
 msgid "Offline"
 msgstr "離線"
 
-#: ../gtk/gtkblist.c:3206
+#: ../gtk/gtkblist.c:3223
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../gtk/gtkblist.c:3208
+#: ../gtk/gtkblist.c:3225
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
 #. Idle stuff
-#: ../gtk/gtkblist.c:3211 ../gtk/gtkprefs.c:1769
+#: ../gtk/gtkblist.c:3228 ../gtk/gtkprefs.c:1801
 #: ../libgaim/protocols/bonjour/bonjour.c:333
 #: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:668 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/jabber/buddy.c:671 ../libgaim/protocols/msn/msn.c:548
 #: ../libgaim/protocols/msn/state.c:32
 #: ../libgaim/protocols/novell/novell.c:2862
-#: ../libgaim/protocols/oscar/oscar.c:2824
+#: ../libgaim/protocols/oscar/oscar.c:2828
 #: ../libgaim/protocols/yahoo/yahoo.c:2881
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "閒置"
 
-#: ../gtk/gtkblist.c:3339
+#: ../gtk/gtkblist.c:3356
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../gtk/gtkblist.c:3340 ../gtk/gtkblist.c:3373
+#: ../gtk/gtkblist.c:3357 ../gtk/gtkblist.c:3390
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../gtk/gtkblist.c:3341
+#: ../gtk/gtkblist.c:3358
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../gtk/gtkblist.c:3342
+#: ../gtk/gtkblist.c:3359
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../gtk/gtkblist.c:3343 ../gtk/gtkblist.c:3376
+#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../gtk/gtkblist.c:3344
+#: ../gtk/gtkblist.c:3361
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: ../gtk/gtkblist.c:3379
+#: ../gtk/gtkblist.c:3396
 msgid "/Tools/Buddy Pounces"
 msgstr "/工具/好友狀態捕捉"
 
-#: ../gtk/gtkblist.c:3382
+#: ../gtk/gtkblist.c:3399
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: ../gtk/gtkblist.c:3385
+#: ../gtk/gtkblist.c:3402
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../gtk/gtkblist.c:3481 ../gtk/gtkdocklet.c:136
+#: ../gtk/gtkblist.c:3498 ../gtk/gtkdocklet.c:152
 #, 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"
 
-#: ../gtk/gtkblist.c:3557
+#: ../gtk/gtkblist.c:3574
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../gtk/gtkblist.c:3559
+#: ../gtk/gtkblist.c:3576
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: ../gtk/gtkblist.c:3560
+#: ../gtk/gtkblist.c:3577
 msgid "By status"
 msgstr "依照狀態"
 
-#: ../gtk/gtkblist.c:3561
+#: ../gtk/gtkblist.c:3578
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: ../gtk/gtkblist.c:3769 ../gtk/gtkconn.c:178
+#: ../gtk/gtkblist.c:3793 ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../gtk/gtkblist.c:3778 ../libgaim/protocols/sametime/sametime.c:3615
+#: ../gtk/gtkblist.c:3802 ../libgaim/protocols/sametime/sametime.c:3653
 msgid "Connect"
 msgstr "連線"
 
-#: ../gtk/gtkblist.c:3778
+#: ../gtk/gtkblist.c:3802
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../gtk/gtkblist.c:3799
+#: ../gtk/gtkblist.c:3823
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
-#: ../gtk/gtkblist.c:3928
+#: ../gtk/gtkblist.c:3906
+msgid "<b>Username:</b>"
+msgstr "<b>使用者名稱:</b>"
+
+#: ../gtk/gtkblist.c:3913
+msgid "<b>Password:</b>"
+msgstr "<b>密碼:</b>"
+
+#: ../gtk/gtkblist.c:3924
+msgid "_Login"
+msgstr "登入(_L)"
+
+#: ../gtk/gtkblist.c:4003
 msgid "/Accounts"
 msgstr "/帳號"
 
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../gtk/gtkblist.c:4017
+msgid ""
+"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<span weight='bold' size='larger'>歡迎使用 Gaim!</span>\n"
+"\n"
+"您未有啟動任何帳號,請透過好友清單上的「帳號->新增」指令,到「帳號清單」啟動"
+"帳號。帳號一經啟動,就隨時可以登入或變更狀態;這樣,您就可以跟您的好友通訊"
+"了!"
+
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../gtk/gtkblist.c:4089
+#: ../gtk/gtkblist.c:4196
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: ../gtk/gtkblist.c:4092
+#: ../gtk/gtkblist.c:4199
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: ../gtk/gtkblist.c:4098
+#: ../gtk/gtkblist.c:4205
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: ../gtk/gtkblist.c:4101
+#: ../gtk/gtkblist.c:4208
 msgid "/Buddies/Show Idle Times"
 msgstr "/好友/顯示閒置時間"
 
-#: ../gtk/gtkblist.c:4766 ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/gtkblist.c:4873 ../gtk/plugins/gevolution/gevolution.c:97
 #: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
 #: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
 #: ../libgaim/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "好友"
 
-#: ../gtk/gtkblist.c:4900
+#: ../gtk/gtkblist.c:5007
 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. "
@@ -1753,438 +1834,462 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: ../gtk/gtkblist.c:4960 ../gtk/gtkblist.c:5323
+#: ../gtk/gtkblist.c:5067 ../gtk/gtkblist.c:5427
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "群組:"
 
-#: ../gtk/gtkblist.c:5221
+#: ../gtk/gtkblist.c:5325
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../gtk/gtkblist.c:5237
+#: ../gtk/gtkblist.c:5341
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: ../gtk/gtkblist.c:5278
+#: ../gtk/gtkblist.c:5382
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../gtk/gtkblist.c:5361
+#: ../gtk/gtkblist.c:5465
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: ../gtk/gtkblist.c:5987
+# XXX
+#: ../gtk/gtkblist.c:6072
+msgid "<GaimMain>/Accounts/"
+msgstr "/帳號/"
+
+#: ../gtk/gtkblist.c:6097
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: ../gtk/gtkblist.c:6020 ../gtk/gtkblist.c:6026 ../gtk/gtkconv.c:2781
+#: ../gtk/gtkblist.c:6130 ../gtk/gtkblist.c:6136 ../gtk/gtkconv.c:2839
 msgid "No actions available"
 msgstr "沒有相關指令"
 
 # #NOTE 和下一個「Enable Account」對應。
-#: ../gtk/gtkblist.c:6034
+#: ../gtk/gtkblist.c:6144
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../gtk/gtkblist.c:6046
+#: ../gtk/gtkblist.c:6156
 msgid "Enable Account"
 msgstr "啟動帳號"
 
-#: ../gtk/gtkblist.c:6099
+# XXX
+#: ../gtk/gtkblist.c:6162
+msgid "<GaimMain>/Accounts/Enable Account"
+msgstr "/帳號/啟動帳號"
+
+#: ../gtk/gtkblist.c:6211
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../gtk/gtkblist.c:6185
+#: ../gtk/gtkblist.c:6281
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
 #: ../gtk/gtkconn.c:179
 #, c-format
 msgid ""
-"%s was disconnected due to an error: %s\n"
+"%s\n"
+"\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"%s 因為下列原因而離線:%s\n"
+"%s\n"
 "在您更正這個錯誤並重新啟動這個帳號前,Gaim 將不會再試著重新連線。"
 
-#: ../gtk/gtkconv.c:744 ../gtk/gtkconv.c:770
+#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: ../gtk/gtkconv.c:764
+#: ../gtk/gtkconv.c:766
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: ../gtk/gtkconv.c:817
+#: ../gtk/gtkconv.c:819
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../gtk/gtkconv.c:847
+#: ../gtk/gtkconv.c:849
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../gtk/gtkconv.c:868
+#: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../gtk/gtkconv.c:888 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
 #: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../gtk/gtkconv.c:945 ../gtk/gtkconv.c:2398 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
 #: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: ../gtk/gtkconv.c:951
+#: ../gtk/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../gtk/gtkconv.c:975
+#: ../gtk/gtkconv.c:977
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../gtk/gtkconv.c:1122 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
+#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "搜尋"
 
-#: ../gtk/gtkconv.c:1148 ../gtk/gtkdebug.c:194
+#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../gtk/gtkconv.c:1319
+#: ../gtk/gtkconv.c:1321
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../gtk/gtkconv.c:1327
+#: ../gtk/gtkconv.c:1329
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../gtk/gtkconv.c:1595
+#: ../gtk/gtkconv.c:1597
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../gtk/gtkconv.c:1598
+#: ../gtk/gtkconv.c:1600
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../gtk/gtkconv.c:1618
+#: ../gtk/gtkconv.c:1620
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../gtk/gtkconv.c:1641
+#: ../gtk/gtkconv.c:1643
 #, fuzzy
 msgid "Last said"
 msgstr "更新日期"
 
-#: ../gtk/gtkconv.c:2406
+#: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../gtk/gtkconv.c:2430
+#: ../gtk/gtkconv.c:2479
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../gtk/gtkconv.c:2479
+#: ../gtk/gtkconv.c:2528
 msgid "Animate"
 msgstr "動畫"
 
-#: ../gtk/gtkconv.c:2484
+#: ../gtk/gtkconv.c:2533
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../gtk/gtkconv.c:2490
+#: ../gtk/gtkconv.c:2536
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
+#: ../gtk/gtkconv.c:2540
+msgid "Set Custom Icon..."
+msgstr "自定圖示..."
+
+#: ../gtk/gtkconv.c:2547
+msgid "Remove Custom Icon"
+msgstr "移除自定圖示"
+
 #. Conversation menu
-#: ../gtk/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2688
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../gtk/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2690
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../gtk/gtkconv.c:2637
+#: ../gtk/gtkconv.c:2695
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../gtk/gtkconv.c:2639
+#: ../gtk/gtkconv.c:2697
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../gtk/gtkconv.c:2640
+#: ../gtk/gtkconv.c:2698
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../gtk/gtkconv.c:2642
+#: ../gtk/gtkconv.c:2700
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../gtk/gtkconv.c:2646
+#: ../gtk/gtkconv.c:2704
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../gtk/gtkconv.c:2647
+#: ../gtk/gtkconv.c:2705
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../gtk/gtkconv.c:2649
+#: ../gtk/gtkconv.c:2707
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../gtk/gtkconv.c:2651
+#: ../gtk/gtkconv.c:2709
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../gtk/gtkconv.c:2653
+#: ../gtk/gtkconv.c:2711
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../gtk/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2715
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../gtk/gtkconv.c:2659
+#: ../gtk/gtkconv.c:2717
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../gtk/gtkconv.c:2661
+#: ../gtk/gtkconv.c:2719
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../gtk/gtkconv.c:2663
+#: ../gtk/gtkconv.c:2721
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../gtk/gtkconv.c:2668
+#: ../gtk/gtkconv.c:2726
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: ../gtk/gtkconv.c:2670
+#: ../gtk/gtkconv.c:2728
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: ../gtk/gtkconv.c:2675
+#: ../gtk/gtkconv.c:2733
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../gtk/gtkconv.c:2679
+#: ../gtk/gtkconv.c:2737
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../gtk/gtkconv.c:2680
+#: ../gtk/gtkconv.c:2738
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../gtk/gtkconv.c:2681
+#: ../gtk/gtkconv.c:2739
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../gtk/gtkconv.c:2682
+#: ../gtk/gtkconv.c:2740
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: ../gtk/gtkconv.c:2684
+#: ../gtk/gtkconv.c:2742
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../gtk/gtkconv.c:2685
+#: ../gtk/gtkconv.c:2743
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../gtk/gtkconv.c:2760
+#: ../gtk/gtkconv.c:2818
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../gtk/gtkconv.c:2798 ../gtk/gtkconv.c:2825
+#. 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.
+#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../gtk/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2903
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../gtk/gtkconv.c:2841
+#: ../gtk/gtkconv.c:2909
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../gtk/gtkconv.c:2845
+#: ../gtk/gtkconv.c:2913
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../gtk/gtkconv.c:2851
+#: ../gtk/gtkconv.c:2919
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../gtk/gtkconv.c:2855
+#: ../gtk/gtkconv.c:2923
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../gtk/gtkconv.c:2861
+#: ../gtk/gtkconv.c:2929
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../gtk/gtkconv.c:2865
+#: ../gtk/gtkconv.c:2933
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../gtk/gtkconv.c:2869
+#: ../gtk/gtkconv.c:2937
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../gtk/gtkconv.c:2873
+#: ../gtk/gtkconv.c:2941
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../gtk/gtkconv.c:2879
+#: ../gtk/gtkconv.c:2947
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: ../gtk/gtkconv.c:2883
+#: ../gtk/gtkconv.c:2951
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: ../gtk/gtkconv.c:2889
+#: ../gtk/gtkconv.c:2957
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../gtk/gtkconv.c:2892
+#: ../gtk/gtkconv.c:2960
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../gtk/gtkconv.c:2905
+#: ../gtk/gtkconv.c:2973
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../gtk/gtkconv.c:2908
+#: ../gtk/gtkconv.c:2976
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../gtk/gtkconv.c:2911
+#: ../gtk/gtkconv.c:2979
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: ../gtk/gtkconv.c:2987
+#: ../gtk/gtkconv.c:3055
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: ../gtk/gtkconv.c:2990
+#: ../gtk/gtkconv.c:3058
 msgid "User has typed something and stopped"
 msgstr "使用者輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../gtk/gtkconv.c:3173
+#: ../gtk/gtkconv.c:3241
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: ../gtk/gtkconv.c:3875
+#: ../gtk/gtkconv.c:3948
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../gtk/gtkconv.c:3929 ../libgaim/protocols/sametime/sametime.c:3557
+#: ../gtk/gtkconv.c:4002 ../libgaim/protocols/sametime/sametime.c:3595
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:3981
+#: ../gtk/gtkconv.c:4054
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../gtk/gtkconv.c:5028 ../gtk/gtkconv.c:5149
+#: ../gtk/gtkconv.c:5101 ../gtk/gtkconv.c:5222
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../gtk/gtkconv.c:5702 ../gtk/gtkstatusbox.c:541
+#: ../gtk/gtkconv.c:5775 ../gtk/gtkstatusbox.c:565
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../gtk/gtkconv.c:5708
+#: ../gtk/gtkconv.c:5781
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../gtk/gtkconv.c:5713
+#: ../gtk/gtkconv.c:5786
 msgid "Nick Said"
 msgstr "暱稱被提及"
 
-#: ../gtk/gtkconv.c:5718 ../gtk/gtkdocklet.c:470
+#: ../gtk/gtkconv.c:5791 ../gtk/gtkdocklet.c:513
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../gtk/gtkconv.c:5723
+#: ../gtk/gtkconv.c:5796
 msgid "New Event"
 msgstr "新事件"
 
-#: ../gtk/gtkconv.c:6818
+#: ../gtk/gtkconv.c:6910
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../gtk/gtkconv.c:6850
+#: ../gtk/gtkconv.c:6942
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: ../gtk/gtkconv.c:7385
+#: ../gtk/gtkconv.c:7477
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../gtk/gtkconv.c:7391
+#: ../gtk/gtkconv.c:7483
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../gtk/gtkconv.c:7399
+#: ../gtk/gtkconv.c:7491
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../gtk/gtkconv.c:7405
+#: ../gtk/gtkconv.c:7497
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../gtk/gtkconv.c:7672
+#: ../gtk/gtkconv.c:7765
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../gtk/gtkconv.c:8136
+#: ../gtk/gtkconv.c:8229
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../gtk/gtkconv.c:8138
+#: ../gtk/gtkconv.c:8231
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../gtk/gtkconv.c:8140 ../gtk/gtkprefs.c:1267
+#: ../gtk/gtkconv.c:8233 ../gtk/gtkprefs.c:1297
 msgid "New window"
 msgstr "新視窗"
 
-#: ../gtk/gtkconv.c:8142
+#: ../gtk/gtkconv.c:8235
 msgid "By group"
 msgstr "依群組"
 
-#: ../gtk/gtkconv.c:8144
+#: ../gtk/gtkconv.c:8237
 msgid "By account"
 msgstr "依帳號"
 
@@ -2258,15 +2363,15 @@
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
 msgid "lead developer"
 msgstr "主要開發者"
 
 #: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
 #: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
 #: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:80
-#: ../gtk/gtkdialogs.c:81 ../gtk/gtkdialogs.c:82
+#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
 msgid "developer"
 msgstr "開發者"
 
@@ -2278,128 +2383,133 @@
 msgid "support"
 msgstr "支援"
 
-#: ../gtk/gtkdialogs.c:101
+#: ../gtk/gtkdialogs.c:80
+msgid "support/QA"
+msgstr "支援兼品管"
+
+#: ../gtk/gtkdialogs.c:102
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: ../gtk/gtkdialogs.c:102 ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
 msgid "maintainer"
 msgstr "維護者"
 
-#: ../gtk/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:105
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:106
+#: ../gtk/gtkdialogs.c:107
 msgid "hacker and designated driver [lazy bum]"
-msgstr "程式編寫者兼指定司機 [懶人]"
-
-#: ../gtk/gtkdialogs.c:107
+msgstr "程式編寫者兼指定司機 [死懶鬼]"
+
+#: ../gtk/gtkdialogs.c:108
 msgid "Jabber developer"
 msgstr "Jabber 開發者"
 
-#: ../gtk/gtkdialogs.c:108
+#: ../gtk/gtkdialogs.c:109
 msgid "original author"
 msgstr "原作者"
 
-#: ../gtk/gtkdialogs.c:115
+#: ../gtk/gtkdialogs.c:116
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:184
+#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:187
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
 msgid "Bengali"
 msgstr "孟加拉文"
 
 # NOTE 港譯「波斯尼亞」
-#: ../gtk/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:121
 msgid "Bosnian"
 msgstr "波士尼亞文"
 
-#: ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:185 ../gtk/gtkdialogs.c:186
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
+# NOTE 正常的叫法是直接寫「瓦倫西亞語」(Valencian)
+#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
 msgid "Valencian-Catalan"
-msgstr "瓦倫西亞式加泰隆文"
-
-#: ../gtk/gtkdialogs.c:124 ../gtk/gtkdialogs.c:187
+msgstr "瓦倫西亞文"
+
+#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:190
 msgid "Czech"
 msgstr "捷克文"
 
-#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:126
 msgid "Danish"
 msgstr "丹麥文"
 
-#: ../gtk/gtkdialogs.c:126 ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:191
 msgid "German"
 msgstr "德文"
 
-#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:131
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: ../gtk/gtkdialogs.c:131
+#: ../gtk/gtkdialogs.c:132
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: ../gtk/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:133
 msgid "British English"
 msgstr "英式英文"
 
 #  XXX 寫下的應是文,不是語,但實在真是好像沒有人寫「世界文」的 - Ambrose
-#: ../gtk/gtkdialogs.c:133
+#: ../gtk/gtkdialogs.c:134
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../gtk/gtkdialogs.c:134 ../gtk/gtkdialogs.c:189 ../gtk/gtkdialogs.c:190
-#: ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
+#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
 msgid "Euskera(Basque)"
 msgstr "巴斯克文"
 
-#: ../gtk/gtkdialogs.c:137 ../gtk/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
 msgid "Persian"
 msgstr "波斯文"
 
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:198 ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
 msgid "French"
 msgstr "法文"
 
-#: ../gtk/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:143
 msgid "Galician"
 msgstr "加里西亞文"
 
-#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
+#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:145
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:202
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:147
 msgid "Hindi"
 msgstr "北印度文"
 
-#: ../gtk/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:148
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -2407,76 +2517,76 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203
 msgid "Italian"
 msgstr "意大利文"
 
-#: ../gtk/gtkdialogs.c:148 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:204 ../gtk/gtkdialogs.c:205
+#: ../gtk/gtkdialogs.c:206
 msgid "Japanese"
 msgstr "日文"
 
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
 msgid "Georgian"
 msgstr "喬治亞文"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:205
+#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:208
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE 港譯「庫爾德」
-#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:155
 msgid "Kurdish"
 msgstr "庫德文"
 
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:206 ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:157
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: ../gtk/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:158
 msgid "Nepali"
 msgstr "尼泊爾文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: ../gtk/gtkdialogs.c:157
+#: ../gtk/gtkdialogs.c:159
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: ../gtk/gtkdialogs.c:158
+#: ../gtk/gtkdialogs.c:160
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:160 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:162 ../gtk/gtkdialogs.c:211
 msgid "Polish"
 msgstr "波蘭文"
 
-#: ../gtk/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:163
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: ../gtk/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:164
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: ../gtk/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:165
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
+#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
 msgid "Russian"
 msgstr "俄文"
 
-#: ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:166
+#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:168
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:214
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
@@ -2484,181 +2594,168 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: ../gtk/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:215
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:171
+msgid "Albanian"
+msgstr "阿爾巴尼亞文"
+
+#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:216
 msgid "Swedish"
 msgstr "瑞典文"
 
 # NOTE 港譯「泰米爾」
-#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:173
 msgid "Tamil"
 msgstr "塔米爾文"
 
-#: ../gtk/gtkdialogs.c:171
+#: ../gtk/gtkdialogs.c:174
 msgid "Telugu"
 msgstr "特魯固文"
 
-#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:175
 msgid "Thai"
 msgstr "泰文"
 
-#: ../gtk/gtkdialogs.c:173
+#: ../gtk/gtkdialogs.c:176
 msgid "Turkish"
 msgstr "土耳其文"
 
-#: ../gtk/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:177
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: ../gtk/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:177
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:213
+#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:217
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: ../gtk/gtkdialogs.c:176 ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:214
+#: ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:180 ../gtk/gtkdialogs.c:218
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # XXX Yahoo譯法
-#: ../gtk/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:186
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../gtk/gtkdialogs.c:295
+#: ../gtk/gtkdialogs.c:299
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: ../gtk/gtkdialogs.c:329
+#: ../gtk/gtkdialogs.c:333
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
-"and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
-"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
+"<BR><BR>You may modify and redistribute the program under the terms of the "
+"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
+"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
+"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim 係一個以 GTK+ 開發的模組化訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、"
-"ICQ、IRC、SILC、Novell GroupWise、Lotus Sametime、Zephyr,Gadu-Gadu 及 QQ 等"
-"功能。<BR><BR>倘若您希望修改或發佈這個程式,只需按照 GPL(第二版或任何以後的"
-"版本)的條款即可;Gaim 內已附有一份 GPL, 可在名為「COPYING」的檔案之內找到。"
-"Gaim 是有版權的著作,版權為 Gaim 的全部貢獻者所有,芳名詳列在名為"
+"ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Zephyr、Gadu-"
+"Gadu 及 QQ 等功能。<BR><BR>倘若您希望修改或發佈這個程式,只需按照 GPL(第二版"
+"或任何以後的版本)的條款即可;Gaim 內已附有一份 GPL, 在名為「COPYING」的檔案"
+"之內。Gaim 是有版權的著作,其版權為眾貢獻者共同所有,芳名詳列在名為"
 "「COPYRIGHT」的檔案內。本程式並不提供任何保用。<BR><BR>"
 
-#: ../gtk/gtkdialogs.c:343
+#: ../gtk/gtkdialogs.c:348
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: ../gtk/gtkdialogs.c:346
+#: ../gtk/gtkdialogs.c:351
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
 "SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
 "\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
-#: ../gtk/gtkdialogs.c:352
+#: ../gtk/gtkdialogs.c:357
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: ../gtk/gtkdialogs.c:367
+#: ../gtk/gtkdialogs.c:372
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../gtk/gtkdialogs.c:382
+#: ../gtk/gtkdialogs.c:387
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: ../gtk/gtkdialogs.c:397
+#: ../gtk/gtkdialogs.c:402
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../gtk/gtkdialogs.c:417
+#: ../gtk/gtkdialogs.c:422
 msgid "Past Translators"
 msgstr "前任譯者"
 
-#: ../gtk/gtkdialogs.c:435
+# NOTE 這是「關於Gaim」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
+#: ../gtk/gtkdialogs.c:440
 msgid "Debugging Information"
-msgstr "除錯訊息"
-
-# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../gtk/gtkdialogs.c:659 ../gtk/gtkdialogs.c:796 ../gtk/gtkdialogs.c:876
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801 ../gtk/gtkdialogs.c:881
-msgid "_Account"
-msgstr "帳號(_A)"
-
-#: ../gtk/gtkdialogs.c:672
-msgid "New Instant Message"
-msgstr "新即時訊息"
-
-#: ../gtk/gtkdialogs.c:674
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "請輸入您所想要發送即時訊息對象的帳號。"
-
-#: ../gtk/gtkdialogs.c:809
+msgstr "除錯專用資訊"
+
+#: ../gtk/gtkdialogs.c:814
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../gtk/gtkdialogs.c:811
+#: ../gtk/gtkdialogs.c:816
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../gtk/gtkdialogs.c:900
+#: ../gtk/gtkdialogs.c:905
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../gtk/gtkdialogs.c:902
+#: ../gtk/gtkdialogs.c:907
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號或別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../gtk/gtkdialogs.c:921
+#: ../gtk/gtkdialogs.c:926
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../gtk/gtkdialogs.c:922
+#: ../gtk/gtkdialogs.c:927
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../gtk/gtkdialogs.c:942
+#: ../gtk/gtkdialogs.c:947
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../gtk/gtkdialogs.c:944
+#: ../gtk/gtkdialogs.c:949
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../gtk/gtkdialogs.c:963
+#: ../gtk/gtkdialogs.c:968
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../gtk/gtkdialogs.c:964
+#: ../gtk/gtkdialogs.c:969
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../gtk/gtkdialogs.c:1001
+#: ../gtk/gtkdialogs.c:1006
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -2674,32 +2771,32 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../gtk/gtkdialogs.c:1009
+#: ../gtk/gtkdialogs.c:1014
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../gtk/gtkdialogs.c:1010
+#: ../gtk/gtkdialogs.c:1015
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
 # TODO 譯文有待改進 - 20061025
-#: ../gtk/gtkdialogs.c:1040
+#: ../gtk/gtkdialogs.c:1045
 #, 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 合併,新群組以後者命名。您要繼續這個動作嗎?"
 
-#: ../gtk/gtkdialogs.c:1047
+#: ../gtk/gtkdialogs.c:1052
 msgid "Merge Groups"
 msgstr "合併群組"
 
-#: ../gtk/gtkdialogs.c:1048
+#: ../gtk/gtkdialogs.c:1053
 msgid "_Merge Groups"
 msgstr "合併群組(_M)"
 
-#: ../gtk/gtkdialogs.c:1098
+#: ../gtk/gtkdialogs.c:1103
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -2707,56 +2804,56 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../gtk/gtkdialogs.c:1101
+#: ../gtk/gtkdialogs.c:1106
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../gtk/gtkdialogs.c:1102
+#: ../gtk/gtkdialogs.c:1107
 msgid "_Remove Group"
 msgstr "移除群組(_R)"
 
-#: ../gtk/gtkdialogs.c:1135
+#: ../gtk/gtkdialogs.c:1140
 #, 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」在中文版Gaim無法析別;可能有改進的空間
-#: ../gtk/gtkdialogs.c:1138
+#: ../gtk/gtkdialogs.c:1143
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: ../gtk/gtkdialogs.c:1139
+#: ../gtk/gtkdialogs.c:1144
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../gtk/gtkdialogs.c:1160
+#: ../gtk/gtkdialogs.c:1165
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: ../gtk/gtkdialogs.c:1163
+#: ../gtk/gtkdialogs.c:1168
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../gtk/gtkdialogs.c:1164
+#: ../gtk/gtkdialogs.c:1169
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../gtk/gtkdocklet.c:133
+#: ../gtk/gtkdocklet.c:149
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../gtk/gtkdocklet.c:413
+#: ../gtk/gtkdocklet.c:456
 msgid "Change Status"
 msgstr "變更狀態"
 
-#: ../gtk/gtkdocklet.c:416 ../gtk/gtkstatusbox.c:971
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1367
+#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:995
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1370
 #: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
 #: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
 #: ../libgaim/protocols/novell/novell.c:2853
@@ -2767,46 +2864,46 @@
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:420 ../gtk/gtkprefs.c:1783 ../gtk/gtkstatusbox.c:972
+#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1815 ../gtk/gtkstatusbox.c:996
 #: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
 #: ../libgaim/protocols/irc/msgs.c:223
-#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/jabber/buddy.c:1374
 #: ../libgaim/protocols/novell/novell.c:2856
-#: ../libgaim/protocols/oscar/oscar.c:694
-#: ../libgaim/protocols/oscar/oscar.c:4406
-#: ../libgaim/protocols/oscar/oscar.c:5473
+#: ../libgaim/protocols/oscar/oscar.c:696
+#: ../libgaim/protocols/oscar/oscar.c:4413
+#: ../libgaim/protocols/oscar/oscar.c:5495
 #: ../libgaim/protocols/silc/buddy.c:1469
 #: ../libgaim/protocols/yahoo/yahoo.c:3359
 #: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
 msgid "Away"
 msgstr "離開"
 
-#: ../gtk/gtkdocklet.c:424 ../gtk/gtkstatusbox.c:973
-#: ../libgaim/protocols/oscar/oscar.c:698
+#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:997
+#: ../libgaim/protocols/oscar/oscar.c:700
 #: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../gtk/gtkdocklet.c:465
+#: ../gtk/gtkdocklet.c:508
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../gtk/gtkdocklet.c:491
+#: ../gtk/gtkdocklet.c:534
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../gtk/gtkdocklet.c:506
+#: ../gtk/gtkdocklet.c:549
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../gtk/gtkdocklet.c:513
+#: ../gtk/gtkdocklet.c:556
 msgid "Blink on new message"
 msgstr "有新訊息時閃動"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: ../gtk/gtkdocklet.c:524
+#: ../gtk/gtkdocklet.c:567
 msgid "Quit"
 msgstr "結束程式"
 
@@ -2820,10 +2917,10 @@
 msgid "Not started"
 msgstr "未啟動"
 
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1662
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1674
 #: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
-#: ../libgaim/protocols/jabber/buddy.c:1361
-#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/jabber/buddy.c:1364
+#: ../libgaim/protocols/jabber/buddy.c:1381
 #: ../libgaim/protocols/novell/novell.c:2868
 msgid "Unknown"
 msgstr "未知"
@@ -2957,40 +3054,40 @@
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../gtk/gtkimhtml.c:826
+#: ../gtk/gtkimhtml.c:831
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../gtk/gtkimhtml.c:1318
+#: ../gtk/gtkimhtml.c:1323
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../gtk/gtkimhtml.c:1319
+#: ../gtk/gtkimhtml.c:1324
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../gtk/gtkimhtml.c:1322
+#: ../gtk/gtkimhtml.c:1327
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../gtk/gtkimhtml.c:1323
+#: ../gtk/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../gtk/gtkimhtml.c:1544
+#: ../gtk/gtkimhtml.c:1549
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../gtk/gtkimhtml.c:1556
+#: ../gtk/gtkimhtml.c:1561
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../gtk/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1571
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../gtk/gtkimhtml.c:3298
+#: ../gtk/gtkimhtml.c:3303
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3001,7 +3098,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../gtk/gtkimhtml.c:3301
+#: ../gtk/gtkimhtml.c:3306
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3011,7 +3108,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../gtk/gtkimhtml.c:3314
+#: ../gtk/gtkimhtml.c:3319
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3022,7 +3119,7 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3317
+#: ../gtk/gtkimhtml.c:3322
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3033,11 +3130,11 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3397 ../gtk/gtkimhtml.c:3409
+#: ../gtk/gtkimhtml.c:3402 ../gtk/gtkimhtml.c:3414
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: ../gtk/gtkimhtml.c:3437
+#: ../gtk/gtkimhtml.c:3442
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3148,22 +3245,22 @@
 msgstr "插入表情"
 
 #  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
-#: ../gtk/gtklog.c:219
+#: ../gtk/gtklog.c:227
 #, 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 是時間
-#: ../gtk/gtklog.c:224
+#: ../gtk/gtklog.c:230
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>與%s於 %s 的交談</span>"
 
-#: ../gtk/gtklog.c:273
+#: ../gtk/gtklog.c:277
 msgid "%B %Y"
 msgstr "%Y年%m月"
 
-#: ../gtk/gtklog.c:320
+#: ../gtk/gtklog.c:324
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -3171,36 +3268,36 @@
 "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日"
 "誌中。"
 
-#: ../gtk/gtklog.c:324
+#: ../gtk/gtklog.c:328
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
 
-#: ../gtk/gtklog.c:327
+#: ../gtk/gtklog.c:331
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
 
-#: ../gtk/gtklog.c:331
+#: ../gtk/gtklog.c:335
 msgid "No logs were found"
 msgstr "找不到日誌"
 
-#: ../gtk/gtklog.c:410
+#: ../gtk/gtklog.c:414
 msgid "Total log size:"
 msgstr "全部日誌大小:"
 
-#: ../gtk/gtklog.c:476
+#: ../gtk/gtklog.c:480
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../gtk/gtklog.c:484 ../gtk/gtklog.c:535
+#: ../gtk/gtklog.c:488 ../gtk/gtklog.c:539
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../gtk/gtklog.c:560
+#: ../gtk/gtklog.c:564
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -3282,7 +3379,7 @@
 "\n"
 "%s"
 
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5450
+#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Search Results"
 msgstr "搜尋結果"
 
@@ -3352,194 +3449,196 @@
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: ../gtk/gtkpounce.c:252
+#: ../gtk/gtkpounce.c:249
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:503
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../gtk/gtkpounce.c:499
+#: ../gtk/gtkpounce.c:503
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:516
+#: ../gtk/gtkpounce.c:520
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../gtk/gtkpounce.c:543
+#: ../gtk/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:569
+#: ../gtk/gtkpounce.c:573
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../gtk/gtkpounce.c:577
+#: ../gtk/gtkpounce.c:581
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../gtk/gtkpounce.c:579
+#: ../gtk/gtkpounce.c:583
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../gtk/gtkpounce.c:581
-msgid "Goes a_way"
-msgstr "離開(_W)"
-
-#: ../gtk/gtkpounce.c:583
-msgid "Ret_urns from away"
-msgstr "返回(_U)"
-
 #: ../gtk/gtkpounce.c:585
-msgid "Becomes _idle"
-msgstr "閒置(_I)"
+msgid "Goes a_way"
+msgstr "離開(_W)"
 
 #: ../gtk/gtkpounce.c:587
+msgid "Ret_urns from away"
+msgstr "返回(_U)"
+
+#: ../gtk/gtkpounce.c:589
+msgid "Becomes _idle"
+msgstr "閒置(_I)"
+
+#: ../gtk/gtkpounce.c:591
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../gtk/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:593
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../gtk/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:595
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../gtk/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:597
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../gtk/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:599
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
 #. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:630
+#: ../gtk/gtkpounce.c:634
 msgid "Action"
 msgstr "執行動作"
 
-#: ../gtk/gtkpounce.c:638
+#: ../gtk/gtkpounce.c:642
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../gtk/gtkpounce.c:640
+#: ../gtk/gtkpounce.c:644
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../gtk/gtkpounce.c:642
+#: ../gtk/gtkpounce.c:646
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../gtk/gtkpounce.c:644
+#: ../gtk/gtkpounce.c:648
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../gtk/gtkpounce.c:646
+#: ../gtk/gtkpounce.c:650
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../gtk/gtkpounce.c:651
+#: ../gtk/gtkpounce.c:655
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../gtk/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:657
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../gtk/gtkpounce.c:654
+#: ../gtk/gtkpounce.c:658
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../gtk/gtkpounce.c:774
+#: ../gtk/gtkpounce.c:778
 msgid "P_ounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../gtk/gtkpounce.c:779
+#: ../gtk/gtkpounce.c:783
 msgid "_Recurring"
 msgstr "重覆發生(_R)"
 
-#: ../gtk/gtkpounce.c:1085
+#: ../gtk/gtkpounce.c:1089
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: ../gtk/gtkpounce.c:1233
+#: ../gtk/gtkpounce.c:1237
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#: ../gtk/gtkpounce.c:1268
+#: ../gtk/gtkpounce.c:1272
 msgid "Recurring"
 msgstr "重覆發生"
 
-#: ../gtk/gtkpounce.c:1315
+#: ../gtk/gtkpounce.c:1319
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../gtk/gtkpounce.c:1442
+#: ../gtk/gtkpounce.c:1446
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: ../gtk/gtkpounce.c:1444
+#: ../gtk/gtkpounce.c:1448
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給您 (%s)"
 
-#: ../gtk/gtkpounce.c:1446
+#: ../gtk/gtkpounce.c:1450
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../gtk/gtkpounce.c:1448
+#: ../gtk/gtkpounce.c:1452
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../gtk/gtkpounce.c:1450
+#: ../gtk/gtkpounce.c:1454
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../gtk/gtkpounce.c:1452
+#: ../gtk/gtkpounce.c:1456
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: ../gtk/gtkpounce.c:1454
+#: ../gtk/gtkpounce.c:1458
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../gtk/gtkpounce.c:1456
+#: ../gtk/gtkpounce.c:1460
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: ../gtk/gtkpounce.c:1458
+# 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
+#: ../gtk/gtkpounce.c:1462
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../gtk/gtkpounce.c:1460
+#: ../gtk/gtkpounce.c:1464
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給您。 (%s)"
 
-#: ../gtk/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1465
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
 # XXX 要覆查 - 20061025
-#: ../gtk/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:509
 msgid "Smiley theme failed to unpack."
 msgstr "無法打開表情主題。"
 
-#: ../gtk/gtkprefs.c:641
+#: ../gtk/gtkprefs.c:638
 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."
@@ -3547,237 +3646,256 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: ../gtk/gtkprefs.c:676
+#: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "圖示"
 
-#: ../gtk/gtkprefs.c:683 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:923
+#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:926
 #: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
 msgstr "描述"
 
-#: ../gtk/gtkprefs.c:824
-msgid "_Hide new IM conversations"
-msgstr "隱藏新的即時訊息交談(_H)"
-
-#: ../gtk/gtkprefs.c:826 ../gtk/gtkprefs.c:1773 ../gtk/gtkprefs.c:1787
-#: ../gtk/plugins/win32/winprefs/winprefs.c:334
-msgid "Never"
-msgstr "從不"
-
-#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1788
-msgid "When away"
-msgstr "離開期間"
-
-#: ../gtk/gtkprefs.c:828 ../gtk/plugins/timestamp_format.c:39
-#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "系統工作匣圖示"
+
+#: ../gtk/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "顯示系統工作匣圖示(_S):"
+
+#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1640
+#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
 #: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "務必"
 
-#: ../gtk/gtkprefs.c:831
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
-
-#: ../gtk/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1805
+#: ../gtk/gtkprefs.c:1819 ../gtk/plugins/win32/winprefs/winprefs.c:334
+msgid "Never"
+msgstr "從不"
+
+#: ../gtk/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "有未讀訊息時"
+
+#: ../gtk/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "隱藏即時訊息交談視窗"
+
+#: ../gtk/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "隱藏新的即時訊息交談(_H):"
+
+#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1820
+msgid "When away"
+msgstr "離開期間"
+
+#. All the tab options!
+#: ../gtk/gtkprefs.c:838
+msgid "Tabs"
+msgstr "分頁"
+
+#: ../gtk/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
+
+#: ../gtk/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "在分頁上顯示關閉鍵(_U)"
+
+#: ../gtk/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "視窗位置額外選項(_P):"
+
+#: ../gtk/gtkprefs.c:859
+msgid "Top"
+msgstr "視窗上方"
+
+#: ../gtk/gtkprefs.c:860
+msgid "Bottom"
+msgstr "視窗下方"
+
+#: ../gtk/gtkprefs.c:861
+msgid "Left"
+msgstr "視窗左側"
+
+#: ../gtk/gtkprefs.c:862
+msgid "Right"
+msgstr "視窗右側"
+
+#: ../gtk/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "左邊垂直"
+
+#: ../gtk/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "右邊垂直"
+
+#: ../gtk/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "新交談(_E):"
+
+#: ../gtk/gtkprefs.c:900
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../gtk/gtkprefs.c:836
+#: ../gtk/gtkprefs.c:903
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: ../gtk/gtkprefs.c:838
+#: ../gtk/gtkprefs.c:905
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../gtk/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:912
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: ../gtk/gtkprefs.c:848
+#: ../gtk/gtkprefs.c:915
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../gtk/gtkprefs.c:852
+#: ../gtk/gtkprefs.c:919
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../gtk/gtkprefs.c:855
+#: ../gtk/gtkprefs.c:922
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../gtk/gtkprefs.c:872
+#: ../gtk/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "預設格式"
+
+# NOTE 這不是說明文,而是樣本本身,玩死人了 :P
+#: ../gtk/gtkprefs.c:941
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
-msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:894
-msgid "Tab Options"
-msgstr "分頁選項"
-
-#: ../gtk/gtkprefs.c:896
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
-
-#: ../gtk/gtkprefs.c:910
-msgid "Show close b_utton on tabs"
-msgstr "在分頁上顯示關閉鍵(_U)"
-
-#: ../gtk/gtkprefs.c:916
-msgid "_Placement:"
-msgstr "視窗位置額外選項(_P):"
-
-#: ../gtk/gtkprefs.c:918
-msgid "Top"
-msgstr "視窗上方"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Bottom"
-msgstr "視窗下方"
-
-#: ../gtk/gtkprefs.c:920
-msgid "Left"
-msgstr "視窗左側"
-
-#: ../gtk/gtkprefs.c:921
-msgid "Right"
-msgstr "視窗右側"
-
-#: ../gtk/gtkprefs.c:923
-msgid "Left Vertical"
-msgstr "左邊垂直"
-
-#: ../gtk/gtkprefs.c:924
-msgid "Right Vertical"
-msgstr "右邊垂直"
-
-#: ../gtk/gtkprefs.c:929
-msgid "N_ew conversations:"
-msgstr "新交談(_E):"
-
-#: ../gtk/gtkprefs.c:980 ../libgaim/protocols/oscar/oscar.c:779
-#: ../libgaim/protocols/oscar/oscar.c:3627
+msgstr ""
+"這是一個樣本。假如您使用的協定支援格式化,送出訊息的式樣將會類似這段文字的格"
+"式。"
+
+#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:781
+#: ../libgaim/protocols/oscar/oscar.c:3634
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: ../gtk/gtkprefs.c:982
+#: ../gtk/gtkprefs.c:1012
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_S):"
 
-#: ../gtk/gtkprefs.c:994
+#: ../gtk/gtkprefs.c:1024
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../gtk/gtkprefs.c:998
+#: ../gtk/gtkprefs.c:1028
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../gtk/gtkprefs.c:1007
+#: ../gtk/gtkprefs.c:1037
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../gtk/gtkprefs.c:1036
+#: ../gtk/gtkprefs.c:1066
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../gtk/gtkprefs.c:1039
+#: ../gtk/gtkprefs.c:1069
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../gtk/gtkprefs.c:1042
+#: ../gtk/gtkprefs.c:1072
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../gtk/gtkprefs.c:1049
+#: ../gtk/gtkprefs.c:1079
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../gtk/gtkprefs.c:1057
+#: ../gtk/gtkprefs.c:1087
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../gtk/gtkprefs.c:1061
+#: ../gtk/gtkprefs.c:1091
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../gtk/gtkprefs.c:1117
+#: ../gtk/gtkprefs.c:1147
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../gtk/gtkprefs.c:1180
+#: ../gtk/gtkprefs.c:1210
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../gtk/gtkprefs.c:1181
+#: ../gtk/gtkprefs.c:1211
 msgid "Opera"
 msgstr "Opera"
 
-#: ../gtk/gtkprefs.c:1182
+#: ../gtk/gtkprefs.c:1212
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../gtk/gtkprefs.c:1183
+#: ../gtk/gtkprefs.c:1213
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../gtk/gtkprefs.c:1184
+#: ../gtk/gtkprefs.c:1214
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../gtk/gtkprefs.c:1185
+#: ../gtk/gtkprefs.c:1215
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../gtk/gtkprefs.c:1186
+#: ../gtk/gtkprefs.c:1216
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../gtk/gtkprefs.c:1187
+#: ../gtk/gtkprefs.c:1217
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../gtk/gtkprefs.c:1188
+#: ../gtk/gtkprefs.c:1218
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../gtk/gtkprefs.c:1189
+#: ../gtk/gtkprefs.c:1219
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../gtk/gtkprefs.c:1198
+#: ../gtk/gtkprefs.c:1228
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../gtk/gtkprefs.c:1251
+#: ../gtk/gtkprefs.c:1281
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../gtk/gtkprefs.c:1255
+#: ../gtk/gtkprefs.c:1285
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../gtk/gtkprefs.c:1263
+#: ../gtk/gtkprefs.c:1293
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../gtk/gtkprefs.c:1265
+#: ../gtk/gtkprefs.c:1295
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../gtk/gtkprefs.c:1266
+#: ../gtk/gtkprefs.c:1296
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../gtk/gtkprefs.c:1268
+#: ../gtk/gtkprefs.c:1298
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../gtk/gtkprefs.c:1282
+#: ../gtk/gtkprefs.c:1312
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3786,79 +3904,79 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../gtk/gtkprefs.c:1321
+#: ../gtk/gtkprefs.c:1352
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../gtk/gtkprefs.c:1326
+#: ../gtk/gtkprefs.c:1357
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../gtk/gtkprefs.c:1328
+#: ../gtk/gtkprefs.c:1359
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../gtk/gtkprefs.c:1330
+#: ../gtk/gtkprefs.c:1361
 msgid "Log all _status changes to system log"
 msgstr "記錄所有的狀態改變至系統日誌"
 
-#: ../gtk/gtkprefs.c:1478
+#: ../gtk/gtkprefs.c:1507
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../gtk/gtkprefs.c:1486
+#: ../gtk/gtkprefs.c:1515
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../gtk/gtkprefs.c:1488
+#: ../gtk/gtkprefs.c:1517
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../gtk/gtkprefs.c:1490
+#: ../gtk/gtkprefs.c:1519
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../gtk/gtkprefs.c:1492 ../libgaim/protocols/silc/silc.c:666
+#: ../gtk/gtkprefs.c:1521 ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "正常"
 
-#: ../gtk/gtkprefs.c:1494
+#: ../gtk/gtkprefs.c:1523
 msgid "Loud"
 msgstr "大聲"
 
-#: ../gtk/gtkprefs.c:1496
+#: ../gtk/gtkprefs.c:1525
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../gtk/gtkprefs.c:1498
+#: ../gtk/gtkprefs.c:1527
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../gtk/gtkprefs.c:1561
+#: ../gtk/gtkprefs.c:1590
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: ../gtk/gtkprefs.c:1562
+#: ../gtk/gtkprefs.c:1591
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../gtk/gtkprefs.c:1564
+#: ../gtk/gtkprefs.c:1593
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../gtk/gtkprefs.c:1566
+#: ../gtk/gtkprefs.c:1595
 msgid "Automatic"
 msgstr "自動"
 
-#: ../gtk/gtkprefs.c:1571
+#: ../gtk/gtkprefs.c:1598
 msgid "Command"
 msgstr "指令"
 
-#: ../gtk/gtkprefs.c:1572
+#: ../gtk/gtkprefs.c:1599
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../gtk/gtkprefs.c:1580
+#: ../gtk/gtkprefs.c:1607
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3867,114 +3985,126 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../gtk/gtkprefs.c:1606
+#: ../gtk/gtkprefs.c:1633
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: ../gtk/gtkprefs.c:1607
+#: ../gtk/gtkprefs.c:1634
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../gtk/gtkprefs.c:1609
-msgid "_Sounds while away"
-msgstr "離開時仍發出音效(_S)"
-
-#: ../gtk/gtkprefs.c:1616
+#: ../gtk/gtkprefs.c:1636
+msgid "Enable sounds:"
+msgstr "啟動音效:"
+
+#: ../gtk/gtkprefs.c:1638
+msgid "Only when available"
+msgstr "上線而非離開期間"
+
+#: ../gtk/gtkprefs.c:1639
+msgid "Only when not available"
+msgstr "離開期間"
+
+#: ../gtk/gtkprefs.c:1647
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../gtk/gtkprefs.c:1644
+#: ../gtk/gtkprefs.c:1675
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../gtk/gtkprefs.c:1695
+#: ../gtk/gtkprefs.c:1726
 msgid "Play"
 msgstr "播放"
 
-#: ../gtk/gtkprefs.c:1702
+#: ../gtk/gtkprefs.c:1733
 msgid "Event"
 msgstr "事件"
 
-#: ../gtk/gtkprefs.c:1721
+#: ../gtk/gtkprefs.c:1752
 msgid "Test"
 msgstr "測試"
 
-#: ../gtk/gtkprefs.c:1725
+#: ../gtk/gtkprefs.c:1756
 msgid "Reset"
 msgstr "重置"
 
-#: ../gtk/gtkprefs.c:1729
+#: ../gtk/gtkprefs.c:1760
 msgid "Choose..."
 msgstr "選擇..."
 
-#: ../gtk/gtkprefs.c:1771
+#: ../gtk/gtkprefs.c:1803
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../gtk/gtkprefs.c:1774
+#: ../gtk/gtkprefs.c:1806
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../gtk/gtkprefs.c:1776
+#: ../gtk/gtkprefs.c:1808
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../gtk/gtkprefs.c:1785
+#: ../gtk/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../gtk/gtkprefs.c:1789
+#: ../gtk/gtkprefs.c:1821
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../gtk/gtkprefs.c:1795
+#: ../gtk/gtkprefs.c:1827
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../gtk/gtkprefs.c:1797
+#: ../gtk/gtkprefs.c:1829
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: ../gtk/gtkprefs.c:1801
+#: ../gtk/gtkprefs.c:1833
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: ../gtk/gtkprefs.c:1809
+#: ../gtk/gtkprefs.c:1841
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../gtk/gtkprefs.c:1830
+#: ../gtk/gtkprefs.c:1862
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../gtk/gtkprefs.c:1832
+#: ../gtk/gtkprefs.c:1864
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../gtk/gtkprefs.c:1838
+#: ../gtk/gtkprefs.c:1870
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../gtk/gtkprefs.c:1889
+#: ../gtk/gtkprefs.c:1908
+msgid "Interface"
+msgstr "介面"
+
+#: ../gtk/gtkprefs.c:1910
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../gtk/gtkprefs.c:1890
+#: ../gtk/gtkprefs.c:1911
 msgid "Sounds"
 msgstr "音效"
 
-#: ../gtk/gtkprefs.c:1891 ../libgaim/protocols/silc/silc.c:1847
+#: ../gtk/gtkprefs.c:1912 ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "網路"
 
-#: ../gtk/gtkprefs.c:1896
+#: ../gtk/gtkprefs.c:1917
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../gtk/gtkprefs.c:1900
+#: ../gtk/gtkprefs.c:1921
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -4086,31 +4216,31 @@
 msgid "Apply"
 msgstr "套用"
 
-#: ../gtk/gtkrequest.c:1467
+#: ../gtk/gtkrequest.c:1468
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../gtk/gtkrequest.c:1468
+#: ../gtk/gtkrequest.c:1469
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: ../gtk/gtkrequest.c:1469
-msgid "Overwrite"
-msgstr "覆寫"
-
 #: ../gtk/gtkrequest.c:1470
+msgid "Overwrite"
+msgstr "覆寫"
+
+#: ../gtk/gtkrequest.c:1471
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1558
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
+#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+#: ../gtk/gtkrequest.c:1606 ../gtk/gtkrequest.c:1620
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
@@ -4218,47 +4348,47 @@
 msgstr "GStreamer 初始化失敗。"
 
 #. connect to the server
-#: ../gtk/gtkstatusbox.c:543 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../gtk/gtkstatusbox.c:567 ../libgaim/protocols/irc/irc.c:329
+#: ../libgaim/protocols/jabber/jabber.c:1015
 #: ../libgaim/protocols/msn/session.c:344
 #: ../libgaim/protocols/novell/novell.c:2185
-#: ../libgaim/protocols/oscar/oscar.c:1224 ../libgaim/protocols/qq/qq.c:134
-#: ../libgaim/protocols/sametime/sametime.c:3678
+#: ../libgaim/protocols/oscar/oscar.c:1226 ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/sametime/sametime.c:3731
 #: ../libgaim/protocols/simple/simple.c:1669
 #: ../libgaim/protocols/yahoo/yahoo.c:2715
 #: ../libgaim/protocols/zephyr/zephyr.c:1617
 msgid "Connecting"
 msgstr "連線中"
 
-#: ../gtk/gtkstatusbox.c:545
+#: ../gtk/gtkstatusbox.c:569
 msgid "Waiting for network connection"
 msgstr "等待網路連線..."
 
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1335
+#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../gtk/gtkutils.c:1312 ../gtk/gtkutils.c:1337
+#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: ../gtk/gtkutils.c:1412
+#: ../gtk/gtkutils.c:1410
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../gtk/gtkutils.c:1414
+#: ../gtk/gtkutils.c:1412
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr "Gaim 沒有辦法傳送目錄。您需要個別傳送檔案"
 
-#: ../gtk/gtkutils.c:1442 ../gtk/gtkutils.c:1451 ../gtk/gtkutils.c:1456
+#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
 msgstr "您拖曳了一個影像"
 
-#: ../gtk/gtkutils.c:1443
+#: ../gtk/gtkutils.c:1441
 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."
@@ -4266,23 +4396,23 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1462
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../gtk/gtkutils.c:1448 ../gtk/gtkutils.c:1463
+#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1463
+#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../gtk/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1450
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: ../gtk/gtkutils.c:1457
+#: ../gtk/gtkutils.c:1455
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -4290,7 +4420,7 @@
 "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔"
 "給這個使用者。"
 
-#: ../gtk/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1457
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -4303,17 +4433,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
-#: ../gtk/gtkutils.c:1513
+#: ../gtk/gtkutils.c:1511
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../gtk/gtkutils.c:1513
+#: ../gtk/gtkutils.c:1511
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "您拖曳了一個啟動器;您大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
 
-#: ../gtk/gtkutils.c:2342
+#: ../gtk/gtkutils.c:2340
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4325,18 +4455,18 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2386 ../gtk/gtkutils.c:2408
+#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:600
+#: ../libgaim/protocols/oscar/oscar.c:602
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: ../gtk/gtkutils.c:2735
+#: ../gtk/gtkutils.c:2733
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../gtk/gtkutils.c:2784
+#: ../gtk/gtkutils.c:2782
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -4403,7 +4533,8 @@
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
 msgstr ""
-"好友在線狀態預測模組 (contact availability plugin, 或稱 cap) 提供有關好友清單內好友的統計資料。"
+"好友在線狀態預測模組 (contact availability plugin, 或稱 cap) 提供有關好友清單"
+"內好友的統計資料。"
 
 #: ../gtk/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -4726,12 +4857,12 @@
 #. "Search"
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
 #: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1724
-#: ../libgaim/protocols/oscar/oscar.c:6085 ../libgaim/protocols/qq/group.c:121
-#: ../libgaim/protocols/qq/group_im.c:137
-#: ../libgaim/protocols/qq/sys_msg.c:160 ../libgaim/protocols/qq/sys_msg.c:230
-#: ../libgaim/protocols/qq/sys_msg.c:248
-#: ../libgaim/protocols/sametime/sametime.c:5523
+#: ../libgaim/protocols/jabber/buddy.c:1727
+#: ../libgaim/protocols/oscar/oscar.c:6107 ../libgaim/protocols/qq/group.c:123
+#: ../libgaim/protocols/qq/group_im.c:139
+#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:250
+#: ../libgaim/protocols/sametime/sametime.c:5614
 msgid "Search"
 msgstr "搜尋"
 
@@ -4772,34 +4903,34 @@
 
 #: ../gtk/plugins/gevolution/eds-utils.c:73
 #: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1145
+#: ../libgaim/protocols/jabber/jabber.c:1160
 msgid "None"
 msgstr "無"
 
-#: ../gtk/plugins/gevolution/gevolution.c:263
-#: ../gtk/plugins/gevolution/gevolution.c:269
+#: ../gtk/plugins/gevolution/gevolution.c:239
+#: ../gtk/plugins/gevolution/gevolution.c:245
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: ../gtk/plugins/gevolution/gevolution.c:264
+#: ../gtk/plugins/gevolution/gevolution.c:240
 msgid "The evolution executable was not found in the PATH."
 msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
 
-#: ../gtk/plugins/gevolution/gevolution.c:270
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "指定的好友不在 Evolution 聯絡人清單中。"
+#: ../gtk/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr "找不到與這個好友相關的電郵地址。"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: ../gtk/plugins/gevolution/gevolution.c:287
+#: ../gtk/plugins/gevolution/gevolution.c:272
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: ../gtk/plugins/gevolution/gevolution.c:291
+#: ../gtk/plugins/gevolution/gevolution.c:284
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:418
+#: ../gtk/plugins/gevolution/gevolution.c:411
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -4807,7 +4938,7 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: ../gtk/plugins/gevolution/gevolution.c:421
+#: ../gtk/plugins/gevolution/gevolution.c:414
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
@@ -4817,7 +4948,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:528
+#: ../gtk/plugins/gevolution/gevolution.c:521
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -4828,8 +4959,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:531
-#: ../gtk/plugins/gevolution/gevolution.c:533
+#: ../gtk/plugins/gevolution/gevolution.c:524
+#: ../gtk/plugins/gevolution/gevolution.c:526
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
@@ -5432,69 +5563,69 @@
 msgid "Provides options specific to Windows Gaim, such as buddy list docking."
 msgstr "提供 Windows Gaim 的相關選項,例如好友清單的停駐功能。"
 
-#: ../libgaim/account.c:774
+#: ../libgaim/account.c:769
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libgaim/account.c:918
+#: ../libgaim/account.c:913
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libgaim/account.c:943
+#: ../libgaim/account.c:938
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libgaim/account.c:950
+#: ../libgaim/account.c:945
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libgaim/account.c:955
+#: ../libgaim/account.c:950
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libgaim/account.c:989 ../libgaim/connection.c:104
+#: ../libgaim/account.c:984 ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libgaim/account.c:1071 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libgaim/account.c:1066 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1310
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libgaim/account.c:1080
+#: ../libgaim/account.c:1075
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libgaim/account.c:1103
+#: ../libgaim/account.c:1098
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libgaim/account.c:1110
+#: ../libgaim/account.c:1105
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libgaim/account.c:1117
+#: ../libgaim/account.c:1112
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: ../libgaim/account.c:1123
+#: ../libgaim/account.c:1118
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libgaim/account.c:1131
+#: ../libgaim/account.c:1126
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: ../libgaim/account.c:1161
+#: ../libgaim/account.c:1156
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: ../libgaim/account.c:1164 ../libgaim/protocols/toc/toc.c:1690
+#: ../libgaim/account.c:1159 ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -5531,7 +5662,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s 登入"
 
-#: ../libgaim/connection.c:325
+#: ../libgaim/connection.c:322
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
@@ -5596,19 +5727,19 @@
 msgid "No name"
 msgstr "未命名"
 
-#: ../libgaim/dbus-server.c:577
+#: ../libgaim/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結:%s"
 
 # TODO 覆查譯文 - 20061028
-#: ../libgaim/dbus-server.c:585
+#: ../libgaim/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "無法取得名稱:%s"
 
 # TODO 覆查譯文 - 20061028
-#: ../libgaim/dbus-server.c:598
+#: ../libgaim/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱:%s"
@@ -5658,7 +5789,7 @@
 msgid "Unknown reason"
 msgstr "原因不明"
 
-#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#: ../libgaim/ft.c:191 ../libgaim/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5667,7 +5798,7 @@
 "讀取 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: ../libgaim/ft.c:193
+#: ../libgaim/ft.c:195
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5676,7 +5807,7 @@
 "寫入 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: ../libgaim/ft.c:197
+#: ../libgaim/ft.c:199
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5686,35 +5817,39 @@
 "%s。\n"
 
 #: ../libgaim/ft.c:230
+msgid "Directory is not writable."
+msgstr "目錄是唯讀的。"
+
+#: ../libgaim/ft.c:245
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: ../libgaim/ft.c:240
+#: ../libgaim/ft.c:255
 msgid "Cannot send a directory."
 msgstr "無法傳送目錄。"
 
-#: ../libgaim/ft.c:249
+#: ../libgaim/ft.c:264
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
 
-#: ../libgaim/ft.c:307
+#: ../libgaim/ft.c:322
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: ../libgaim/ft.c:314
+#: ../libgaim/ft.c:329
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: ../libgaim/ft.c:355
+#: ../libgaim/ft.c:370
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: ../libgaim/ft.c:359
+#: ../libgaim/ft.c:374
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5725,60 +5860,60 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: ../libgaim/ft.c:392
+#: ../libgaim/ft.c:407
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: ../libgaim/ft.c:444
+#: ../libgaim/ft.c:459
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "「%s」不是一個有效的檔案名稱。\n"
 
-#: ../libgaim/ft.c:465
+#: ../libgaim/ft.c:480
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: ../libgaim/ft.c:477
+#: ../libgaim/ft.c:492
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: ../libgaim/ft.c:631
+#: ../libgaim/ft.c:646
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: ../libgaim/ft.c:634
+#: ../libgaim/ft.c:649
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: ../libgaim/ft.c:1023
+#: ../libgaim/ft.c:1038
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: ../libgaim/ft.c:1028
+#: ../libgaim/ft.c:1043
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: ../libgaim/ft.c:1086
+#: ../libgaim/ft.c:1101
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: ../libgaim/ft.c:1091
+#: ../libgaim/ft.c:1106
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: ../libgaim/ft.c:1148
+#: ../libgaim/ft.c:1163
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: ../libgaim/ft.c:1150
+#: ../libgaim/ft.c:1165
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
@@ -5996,13 +6131,18 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1649
+#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1652
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2677
+#: ../libgaim/protocols/oscar/oscar.c:2681
 msgid "Unknown error"
 msgstr "未知錯誤"
 
+#: ../libgaim/plugin.c:365
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr "您目前使用的是 %s,但這模組需要 %s。"
+
 #: ../libgaim/plugin.c:434
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -6185,39 +6325,47 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
 
-#: ../libgaim/plugins/log_reader.c:1412
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+#: ../libgaim/plugins/log_reader.c:497
+msgid "(UTC)"
+msgstr "(UTC)"
+
+#: ../libgaim/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libgaim/plugins/log_reader.c:1418
+#: ../libgaim/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "自動回應送出:"
 
-#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libgaim/plugins/log_reader.c:1445
+#: ../libgaim/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libgaim/plugins/log_reader.c:1455
+#: ../libgaim/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
-#: ../libgaim/plugins/log_reader.c:1463
+#: ../libgaim/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
 
-#: ../libgaim/plugins/log_reader.c:1478
+#: ../libgaim/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限,所以訊息無法送出。"
 
-#: ../libgaim/plugins/log_reader.c:1483
+#: ../libgaim/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
@@ -6225,28 +6373,28 @@
 #. 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.
-#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
 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.
-#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
 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.
-#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
 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.
-#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -6254,25 +6402,25 @@
 #. 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.
-#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:1922
+#: ../libgaim/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libgaim/plugins/log_reader.c:1926
+#: ../libgaim/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
-#: ../libgaim/plugins/log_reader.c:1930
+#: ../libgaim/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:1936
+#: ../libgaim/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -6282,20 +6430,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:1981
+#: ../libgaim/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:1985
+#: ../libgaim/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6350,29 +6498,27 @@
 "對方一開始與您交談,就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
 "Yahoo。"
 
-#. This is a quote from Star Wars.  You should
-#. probably not translate it literally.  If
-#. you can't find a fitting cultural reference
-#. in your language, consider translating
-#. something like this instead:
-#. "You feel a new message coming."
-#: ../libgaim/plugins/psychic.c:63
+#: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr "您感受到了原力的擾動..."
 
-#: ../libgaim/plugins/psychic.c:82
+#: ../libgaim/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "只用於好友清單中的使用者"
 
-#: ../libgaim/plugins/psychic.c:87
+#: ../libgaim/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "離開時停用"
 
 # FIXME 譯文有待改進 - 20061027
-#: ../libgaim/plugins/psychic.c:91
+#: ../libgaim/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
 
+#: ../libgaim/plugins/psychic.c:99
+msgid "Raise psychic conversations"
+msgstr "浮現「未卜先知」的交談"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6533,6 +6679,14 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
+#: ../libgaim/plugins/tcl/tcl.c:481
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
+"com 下載及安裝 ActiveTCL。\n"
+
 #. Send a message about the connection error
 #: ../libgaim/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
@@ -6544,7 +6698,7 @@
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/sametime/sametime.c:3236
+#: ../libgaim/protocols/sametime/sametime.c:3274
 #, c-format
 msgid ""
 "\n"
@@ -6592,17 +6746,17 @@
 
 #. Creating the options for the protocol
 #: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:796
+#: ../libgaim/protocols/jabber/jabber.c:804
 msgid "First name"
 msgstr "名"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:801
+#: ../libgaim/protocols/jabber/jabber.c:809
 msgid "Last name"
 msgstr "姓"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:786
+#: ../libgaim/protocols/jabber/jabber.c:794
 #: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "電子郵件"
@@ -6645,11 +6799,11 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1774
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1774
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -6719,8 +6873,8 @@
 msgstr "註冊成功!"
 
 #: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:775
-#: ../libgaim/protocols/jabber/jabber.c:1330
+#: ../libgaim/protocols/jabber/jabber.c:783
+#: ../libgaim/protocols/jabber/jabber.c:1345
 msgid "Password"
 msgstr "密碼"
 
@@ -6746,14 +6900,14 @@
 
 #. General
 #: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2182
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2188
 #: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:800
-#: ../libgaim/protocols/jabber/buddy.c:1526
-#: ../libgaim/protocols/jabber/buddy.c:1708
-#: ../libgaim/protocols/jabber/jabber.c:791
+#: ../libgaim/protocols/jabber/buddy.c:803
+#: ../libgaim/protocols/jabber/buddy.c:1529
+#: ../libgaim/protocols/jabber/buddy.c:1711
+#: ../libgaim/protocols/jabber/jabber.c:799
 #: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libgaim/protocols/qq/buddy_info.c:43
 #: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
 #: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
@@ -6761,10 +6915,10 @@
 msgstr "暱稱"
 
 #: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:811
-#: ../libgaim/protocols/oscar/oscar.c:3683
-#: ../libgaim/protocols/oscar/oscar.c:3691
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:819
+#: ../libgaim/protocols/oscar/oscar.c:3690
+#: ../libgaim/protocols/oscar/oscar.c:3698
+#: ../libgaim/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
@@ -6773,8 +6927,8 @@
 msgstr "出生年"
 
 #: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/oscar/oscar.c:3654
+#: ../libgaim/protocols/qq/buddy_info.c:46
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
 msgid "Gender"
 msgstr "性別"
@@ -6783,13 +6937,13 @@
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:81
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3654
+#: ../libgaim/protocols/qq/buddy_info.c:83
 msgid "Male"
 msgstr "男"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3647
-#: ../libgaim/protocols/qq/buddy_info.c:82
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3654
+#: ../libgaim/protocols/qq/buddy_info.c:84
 msgid "Female"
 msgstr "女"
 
@@ -6847,14 +7001,14 @@
 msgstr "新增到聊天室..."
 
 #: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/oscar/oscar.c:3619
+#: ../libgaim/protocols/oscar/oscar.c:3626
 msgid "UIN"
 msgstr "帳號"
 
 #: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
-#: ../libgaim/protocols/jabber/buddy.c:1522
-#: ../libgaim/protocols/jabber/buddy.c:1698
-#: ../libgaim/protocols/oscar/oscar.c:3630
+#: ../libgaim/protocols/jabber/buddy.c:1525
+#: ../libgaim/protocols/jabber/buddy.c:1701
+#: ../libgaim/protocols/oscar/oscar.c:3637
 #: ../libgaim/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "名"
@@ -6864,7 +7018,7 @@
 msgstr "出生年"
 
 #: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
-#: ../libgaim/protocols/oscar/oscar.c:3794
+#: ../libgaim/protocols/oscar/oscar.c:3801
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
@@ -6905,67 +7059,67 @@
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1710
+#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1716
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libgaim/protocols/gg/gg.c:1616 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libgaim/protocols/gg/gg.c:1639
+#: ../libgaim/protocols/gg/gg.c:1645
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libgaim/protocols/gg/gg.c:1648
+#: ../libgaim/protocols/gg/gg.c:1654
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libgaim/protocols/gg/gg.c:1652
+#: ../libgaim/protocols/gg/gg.c:1658
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libgaim/protocols/gg/gg.c:1675
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#: ../libgaim/protocols/gg/gg.c:1902
+#: ../libgaim/protocols/gg/gg.c:1908
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libgaim/protocols/gg/gg.c:1903
+#: ../libgaim/protocols/gg/gg.c:1909
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libgaim/protocols/gg/gg.c:1986
+#: ../libgaim/protocols/gg/gg.c:1992
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libgaim/protocols/gg/gg.c:2009
+#: ../libgaim/protocols/gg/gg.c:2015
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libgaim/protocols/gg/gg.c:2015
+#: ../libgaim/protocols/gg/gg.c:2021
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libgaim/protocols/gg/gg.c:2021
+#: ../libgaim/protocols/gg/gg.c:2027
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libgaim/protocols/gg/gg.c:2025
+#: ../libgaim/protocols/gg/gg.c:2031
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libgaim/protocols/gg/gg.c:2029
+#: ../libgaim/protocols/gg/gg.c:2035
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libgaim/protocols/gg/gg.c:2039
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libgaim/protocols/gg/gg.c:2037
+#: ../libgaim/protocols/gg/gg.c:2043
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -6980,16 +7134,16 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2134
+#: ../libgaim/protocols/gg/gg.c:2140
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2135
+#: ../libgaim/protocols/gg/gg.c:2141
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libgaim/protocols/gg/gg.c:2183
+#: ../libgaim/protocols/gg/gg.c:2189
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
@@ -7061,8 +7215,8 @@
 msgstr "IRC 暱稱不可含有空白字元"
 
 # XXX 暫譯
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:571
-#: ../libgaim/protocols/jabber/jabber.c:916
+#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:579
+#: ../libgaim/protocols/jabber/jabber.c:924
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
@@ -7071,8 +7225,8 @@
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:449
-#: ../libgaim/protocols/oscar/oscar.c:1220
+#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:457
+#: ../libgaim/protocols/oscar/oscar.c:1222
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
@@ -7080,11 +7234,11 @@
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:473
+#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:481
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:476
+#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:484
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
@@ -7099,7 +7253,7 @@
 msgstr "使用者"
 
 #: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3347
+#: ../libgaim/protocols/sametime/sametime.c:3385
 #: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -7124,10 +7278,9 @@
 
 #. host to connect to
 #: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
-#: ../libgaim/protocols/jabber/jabber.c:1961
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/oscar/oscar.c:6531
-#: ../libgaim/protocols/qq/qq.c:1031
-#: ../libgaim/protocols/sametime/sametime.c:5629
+#: ../libgaim/protocols/jabber/jabber.c:1976
+#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/qq/qq.c:1033
+#: ../libgaim/protocols/sametime/sametime.c:5720
 #: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
 #: ../libgaim/protocols/simple/simple.c:1835
 #: ../libgaim/protocols/toc/toc.c:2347
@@ -7136,8 +7289,8 @@
 
 #. port to connect to
 #: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/oscar/oscar.c:6534 ../libgaim/protocols/qq/qq.c:1034
-#: ../libgaim/protocols/sametime/sametime.c:5634
+#: ../libgaim/protocols/qq/qq.c:1036
+#: ../libgaim/protocols/sametime/sametime.c:5725
 #: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "通訊埠"
@@ -7147,7 +7300,7 @@
 msgstr "編碼"
 
 #: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/jabber/jabber.c:771
+#: ../libgaim/protocols/jabber/jabber.c:779
 #: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
 #: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
 #: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
@@ -7194,7 +7347,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b>%s"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3620
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3627
 #: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "暱稱"
@@ -7479,7 +7632,7 @@
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
 #: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1766
+#: ../libgaim/protocols/jabber/jabber.c:1781
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -7597,7 +7750,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libgaim/protocols/irc/parse.c:548 ../libgaim/protocols/irc/parse.c:552
+#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
 #: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
 #: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
@@ -7660,91 +7813,91 @@
 msgstr "SASL 錯誤"
 
 #: ../libgaim/protocols/jabber/buddy.c:268
-#: ../libgaim/protocols/jabber/buddy.c:769
+#: ../libgaim/protocols/jabber/buddy.c:772
 #: ../libgaim/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
 #: ../libgaim/protocols/jabber/buddy.c:269
-#: ../libgaim/protocols/jabber/buddy.c:782
+#: ../libgaim/protocols/jabber/buddy.c:785
 #: ../libgaim/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
 #: ../libgaim/protocols/jabber/buddy.c:270
-#: ../libgaim/protocols/jabber/buddy.c:786
+#: ../libgaim/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "名"
 
 #: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/jabber.c:831
+#: ../libgaim/protocols/jabber/jabber.c:839
 msgid "URL"
 msgstr "URL"
 
 #: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:838
+#: ../libgaim/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "街道地址"
 
 #: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:834
+#: ../libgaim/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "地址(續)"
 
 #: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/buddy.c:842
+#: ../libgaim/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "市/村"
 
 #: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:846
+#: ../libgaim/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "省/州"
 
 #: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:850
+#: ../libgaim/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:855
+#: ../libgaim/protocols/jabber/buddy.c:858
 #: ../libgaim/protocols/silc/silc.c:939
 msgid "Country"
 msgstr "國家"
 
 #: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:866
-#: ../libgaim/protocols/jabber/buddy.c:873
+#: ../libgaim/protocols/jabber/buddy.c:869
+#: ../libgaim/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "電話"
 
 #: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:884
-#: ../libgaim/protocols/jabber/buddy.c:892
-#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libgaim/protocols/jabber/buddy.c:895
+#: ../libgaim/protocols/jabber/buddy.c:1531
 #: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "電子郵件"
 
 #: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:907
+#: ../libgaim/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "所屬機構"
 
 #: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:911
+#: ../libgaim/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "所屬部門"
 
 #: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:920
+#: ../libgaim/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "職責"
 
 #: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:803 ../libgaim/protocols/msn/msn.c:1595
-#: ../libgaim/protocols/oscar/oscar.c:3663
+#: ../libgaim/protocols/jabber/buddy.c:806 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/oscar/oscar.c:3670
 msgid "Birthday"
 msgstr "生日"
 
@@ -7765,7 +7918,7 @@
 msgstr "用戶端:"
 
 #: ../libgaim/protocols/jabber/buddy.c:644
-#: ../libgaim/protocols/jabber/buddy.c:677
+#: ../libgaim/protocols/jabber/buddy.c:680
 msgid "Operating System"
 msgstr "作業系統"
 
@@ -7774,68 +7927,68 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libgaim/protocols/jabber/buddy.c:655
+#: ../libgaim/protocols/jabber/jabber.c:1979
 msgid "Resource"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/jabber.c:1204
-#: ../libgaim/protocols/jabber/jabber.c:1214
-#: ../libgaim/protocols/jabber/jabber.c:1224
-#: ../libgaim/protocols/jabber/jabber.c:1234
-#: ../libgaim/protocols/jabber/jabber.c:1244
+#: ../libgaim/protocols/jabber/buddy.c:657
+#: ../libgaim/protocols/jabber/jabber.c:1219
+#: ../libgaim/protocols/jabber/jabber.c:1229
+#: ../libgaim/protocols/jabber/jabber.c:1239
+#: ../libgaim/protocols/jabber/jabber.c:1249
+#: ../libgaim/protocols/jabber/jabber.c:1259
 msgid "Priority"
 msgstr "優先次序"
 
 # NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
-#: ../libgaim/protocols/jabber/buddy.c:673
+#: ../libgaim/protocols/jabber/buddy.c:676
 msgid "Client"
 msgstr "用戶端"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: ../libgaim/protocols/jabber/buddy.c:790
+#: ../libgaim/protocols/jabber/buddy.c:793
 #: ../libgaim/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: ../libgaim/protocols/jabber/buddy.c:823
-#: ../libgaim/protocols/jabber/jabber.c:806
-#: ../libgaim/protocols/oscar/oscar.c:3682
-#: ../libgaim/protocols/oscar/oscar.c:3690
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libgaim/protocols/jabber/buddy.c:826
+#: ../libgaim/protocols/jabber/jabber.c:814
+#: ../libgaim/protocols/oscar/oscar.c:3689
+#: ../libgaim/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/qq/buddy_info.c:56
 #: ../libgaim/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: ../libgaim/protocols/jabber/buddy.c:830
+#: ../libgaim/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: ../libgaim/protocols/jabber/buddy.c:944
+#: ../libgaim/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libgaim/protocols/jabber/buddy.c:1308
+#: ../libgaim/protocols/jabber/buddy.c:1311
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libgaim/protocols/jabber/buddy.c:1312
+#: ../libgaim/protocols/jabber/buddy.c:1315
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1320
+#: ../libgaim/protocols/jabber/buddy.c:1323
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libgaim/protocols/jabber/buddy.c:1327
+#: ../libgaim/protocols/jabber/buddy.c:1330
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -7844,43 +7997,43 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1336
+#: ../libgaim/protocols/jabber/buddy.c:1339
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/jabber.c:1213
+#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libgaim/protocols/jabber/jabber.c:1228
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libgaim/protocols/jabber/buddy.c:1373 ../libgaim/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1376 ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1243
-#: ../libgaim/protocols/oscar/oscar.c:688
-#: ../libgaim/protocols/oscar/oscar.c:5654
-#: ../libgaim/protocols/sametime/sametime.c:3270
+#: ../libgaim/protocols/jabber/buddy.c:1378
+#: ../libgaim/protocols/jabber/jabber.c:1258
+#: ../libgaim/protocols/oscar/oscar.c:690
+#: ../libgaim/protocols/oscar/oscar.c:5676
+#: ../libgaim/protocols/sametime/sametime.c:3308
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libgaim/protocols/jabber/buddy.c:1520
+#: ../libgaim/protocols/jabber/buddy.c:1523
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1524
-#: ../libgaim/protocols/jabber/buddy.c:1703
-#: ../libgaim/protocols/oscar/oscar.c:3631
+#: ../libgaim/protocols/jabber/buddy.c:1527
+#: ../libgaim/protocols/jabber/buddy.c:1706
+#: ../libgaim/protocols/oscar/oscar.c:3638
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libgaim/protocols/jabber/buddy.c:1559
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1631
+#: ../libgaim/protocols/jabber/buddy.c:1634
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -7888,56 +8041,56 @@
 "請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
 "元 (%) 搜尋"
 
-#: ../libgaim/protocols/jabber/buddy.c:1651
+#: ../libgaim/protocols/jabber/buddy.c:1654
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libgaim/protocols/jabber/buddy.c:1652
+#: ../libgaim/protocols/jabber/buddy.c:1655
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1686
+#: ../libgaim/protocols/jabber/buddy.c:1689
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1693
+#: ../libgaim/protocols/jabber/buddy.c:1696
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "填入一個或多個欄位,以搜尋Jabber使用者。"
 
-#: ../libgaim/protocols/jabber/buddy.c:1713
+#: ../libgaim/protocols/jabber/buddy.c:1716
 #: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3633
 #: ../libgaim/protocols/oscar/oscar.c:3640
+#: ../libgaim/protocols/oscar/oscar.c:3647
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libgaim/protocols/jabber/buddy.c:1722
-#: ../libgaim/protocols/jabber/buddy.c:1723
+#: ../libgaim/protocols/jabber/buddy.c:1725
+#: ../libgaim/protocols/jabber/buddy.c:1726
 msgid "Search for Jabber users"
 msgstr "搜尋Jabber使用者"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libgaim/protocols/jabber/buddy.c:1737
+#: ../libgaim/protocols/jabber/buddy.c:1740
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libgaim/protocols/jabber/buddy.c:1754
+#: ../libgaim/protocols/jabber/buddy.c:1757
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libgaim/protocols/jabber/buddy.c:1755
+#: ../libgaim/protocols/jabber/buddy.c:1758
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
+#: ../libgaim/protocols/jabber/buddy.c:1761
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5137
+#: ../libgaim/protocols/oscar/oscar.c:5144
 #: ../libgaim/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -8050,89 +8203,88 @@
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libgaim/protocols/jabber/jabber.c:493
-#: ../libgaim/protocols/jabber/jabber.c:924
+#: ../libgaim/protocols/jabber/jabber.c:501
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libgaim/protocols/jabber/jabber.c:541
-#: ../libgaim/protocols/jabber/jabber.c:884
+#: ../libgaim/protocols/jabber/jabber.c:549
+#: ../libgaim/protocols/jabber/jabber.c:892
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
-#: ../libgaim/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:620
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libgaim/protocols/jabber/jabber.c:614
-#: ../libgaim/protocols/jabber/jabber.c:615
+#: ../libgaim/protocols/jabber/jabber.c:622
+#: ../libgaim/protocols/jabber/jabber.c:623
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libgaim/protocols/jabber/jabber.c:621
-#: ../libgaim/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:629
+#: ../libgaim/protocols/jabber/jabber.c:1494
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
-#: ../libgaim/protocols/jabber/jabber.c:624
+#: ../libgaim/protocols/jabber/jabber.c:631
+#: ../libgaim/protocols/jabber/jabber.c:632
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libgaim/protocols/jabber/jabber.c:739
-#: ../libgaim/protocols/jabber/jabber.c:740
+#: ../libgaim/protocols/jabber/jabber.c:747
+#: ../libgaim/protocols/jabber/jabber.c:748
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libgaim/protocols/jabber/jabber.c:816
-#: ../libgaim/protocols/oscar/oscar.c:3684
-#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/jabber/jabber.c:824
+#: ../libgaim/protocols/oscar/oscar.c:3691
+#: ../libgaim/protocols/oscar/oscar.c:3699
 msgid "State"
 msgstr "省/州"
 
-#: ../libgaim/protocols/jabber/jabber.c:821
+#: ../libgaim/protocols/jabber/jabber.c:829
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libgaim/protocols/jabber/jabber.c:826
+#: ../libgaim/protocols/jabber/jabber.c:834
 #: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "電話"
 
-#: ../libgaim/protocols/jabber/jabber.c:836
+#: ../libgaim/protocols/jabber/jabber.c:844
 msgid "Date"
 msgstr "日期"
 
-#: ../libgaim/protocols/jabber/jabber.c:844
+#: ../libgaim/protocols/jabber/jabber.c:852
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
-#: ../libgaim/protocols/jabber/jabber.c:848
+#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libgaim/protocols/jabber/jabber.c:856
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
-#: ../libgaim/protocols/jabber/jabber.c:1004
+#: ../libgaim/protocols/jabber/jabber.c:1019
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/jabber/jabber.c:1024
 #: ../libgaim/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1018
+#: ../libgaim/protocols/jabber/jabber.c:1033
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libgaim/protocols/jabber/jabber.c:1092
-#: ../libgaim/protocols/jabber/jabber.c:1457
-#: ../libgaim/protocols/jabber/jabber.c:1498
-#: ../libgaim/protocols/jabber/jabber.c:1532
-#: ../libgaim/protocols/oscar/oscar.c:766
-#: ../libgaim/protocols/oscar/oscar.c:5443
+#: ../libgaim/protocols/jabber/jabber.c:1107
+#: ../libgaim/protocols/jabber/jabber.c:1472
+#: ../libgaim/protocols/jabber/jabber.c:1513
+#: ../libgaim/protocols/jabber/jabber.c:1547
+#: ../libgaim/protocols/oscar/oscar.c:768
+#: ../libgaim/protocols/oscar/oscar.c:5465
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -8141,76 +8293,76 @@
 # 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
-#: ../libgaim/protocols/jabber/jabber.c:1134
+#: ../libgaim/protocols/jabber/jabber.c:1149
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見上
-#: ../libgaim/protocols/jabber/jabber.c:1136
+#: ../libgaim/protocols/jabber/jabber.c:1151
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: ../libgaim/protocols/jabber/jabber.c:1141
+#: ../libgaim/protocols/jabber/jabber.c:1156
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見上
-#: ../libgaim/protocols/jabber/jabber.c:1143
+#: ../libgaim/protocols/jabber/jabber.c:1158
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: ../libgaim/protocols/jabber/jabber.c:1147
+#: ../libgaim/protocols/jabber/jabber.c:1162
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libgaim/protocols/jabber/jabber.c:1273
+#: ../libgaim/protocols/jabber/jabber.c:1288
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libgaim/protocols/jabber/jabber.c:1274
+#: ../libgaim/protocols/jabber/jabber.c:1289
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1278
-#: ../libgaim/protocols/jabber/jabber.c:1279
+#: ../libgaim/protocols/jabber/jabber.c:1293
+#: ../libgaim/protocols/jabber/jabber.c:1294
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libgaim/protocols/jabber/jabber.c:1335
+#: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1340
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1355
+#: ../libgaim/protocols/jabber/jabber.c:1356
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: ../libgaim/protocols/jabber/jabber.c:1341
+#: ../libgaim/protocols/jabber/jabber.c:1356
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: ../libgaim/protocols/jabber/jabber.c:1351
-#: ../libgaim/protocols/oscar/oscar.c:6245
+#: ../libgaim/protocols/jabber/jabber.c:1366
+#: ../libgaim/protocols/oscar/oscar.c:6267
 #: ../libgaim/protocols/silc/silc.c:1019
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1356
-#: ../libgaim/protocols/oscar/oscar.c:6256
+#: ../libgaim/protocols/jabber/jabber.c:1371
+#: ../libgaim/protocols/oscar/oscar.c:6278
 #: ../libgaim/protocols/silc/silc.c:1015
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1361
+#: ../libgaim/protocols/jabber/jabber.c:1376
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libgaim/protocols/jabber/jabber.c:1437
+#: ../libgaim/protocols/jabber/jabber.c:1452
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -8218,51 +8370,51 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libgaim/protocols/jabber/jabber.c:1439
+#: ../libgaim/protocols/jabber/jabber.c:1454
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libgaim/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1456
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libgaim/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1458
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libgaim/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1460
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libgaim/protocols/jabber/jabber.c:1447
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1537
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libgaim/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1464
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: ../libgaim/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1466
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libgaim/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1468
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libgaim/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:1470
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libgaim/protocols/jabber/jabber.c:1474
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -8270,78 +8422,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libgaim/protocols/jabber/jabber.c:1482
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
+#: ../libgaim/protocols/jabber/jabber.c:1484
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1486
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libgaim/protocols/jabber/jabber.c:1488
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libgaim/protocols/jabber/jabber.c:1490
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libgaim/protocols/jabber/jabber.c:1492
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libgaim/protocols/jabber/jabber.c:1484
+#: ../libgaim/protocols/jabber/jabber.c:1499
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libgaim/protocols/jabber/jabber.c:1486
+#: ../libgaim/protocols/jabber/jabber.c:1501
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libgaim/protocols/jabber/jabber.c:1504
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: ../libgaim/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1507
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libgaim/protocols/jabber/jabber.c:1510
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libgaim/protocols/jabber/jabber.c:1500
+#: ../libgaim/protocols/jabber/jabber.c:1515
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libgaim/protocols/jabber/jabber.c:1503
+#: ../libgaim/protocols/jabber/jabber.c:1518
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libgaim/protocols/jabber/jabber.c:1522
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libgaim/protocols/jabber/jabber.c:1509
+#: ../libgaim/protocols/jabber/jabber.c:1524
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -8351,198 +8503,198 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1512
+#: ../libgaim/protocols/jabber/jabber.c:1527
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/jabber/jabber.c:1529
 #: ../libgaim/protocols/silc/ops.c:1727
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1531
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1533
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libgaim/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1535
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libgaim/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1539
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: ../libgaim/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1541
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libgaim/protocols/jabber/jabber.c:1528
+#: ../libgaim/protocols/jabber/jabber.c:1543
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1545
 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
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libgaim/protocols/jabber/jabber.c:1549
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1536
+#: ../libgaim/protocols/jabber/jabber.c:1551
 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
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libgaim/protocols/jabber/jabber.c:1553
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libgaim/protocols/jabber/jabber.c:1555
 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
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libgaim/protocols/jabber/jabber.c:1557
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libgaim/protocols/jabber/jabber.c:1559
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libgaim/protocols/jabber/jabber.c:1561
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libgaim/protocols/jabber/jabber.c:1563
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libgaim/protocols/jabber/jabber.c:1565
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libgaim/protocols/jabber/jabber.c:1567
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: ../libgaim/protocols/jabber/jabber.c:1554
+#: ../libgaim/protocols/jabber/jabber.c:1569
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libgaim/protocols/jabber/jabber.c:1571
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libgaim/protocols/jabber/jabber.c:1623
+#: ../libgaim/protocols/jabber/jabber.c:1638
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1643
+#: ../libgaim/protocols/jabber/jabber.c:1658
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的指令:%s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1648
+#: ../libgaim/protocols/jabber/jabber.c:1663
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1667
+#: ../libgaim/protocols/jabber/jabber.c:1682
 #, fuzzy, c-format
 msgid "Unknown role: \"%s\""
 msgstr "未知的指令:%s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1674
+#: ../libgaim/protocols/jabber/jabber.c:1689
 #, fuzzy, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1727
+#: ../libgaim/protocols/jabber/jabber.c:1742
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1773
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1762
+#: ../libgaim/protocols/jabber/jabber.c:1777
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1771
+#: ../libgaim/protocols/jabber/jabber.c:1786
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1791
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1782
+#: ../libgaim/protocols/jabber/jabber.c:1797
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libgaim/protocols/jabber/jabber.c:1803
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1794
+#: ../libgaim/protocols/jabber/jabber.c:1809
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1800
+#: ../libgaim/protocols/jabber/jabber.c:1815
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1806
+#: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1812
+#: ../libgaim/protocols/jabber/jabber.c:1827
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libgaim/protocols/jabber/jabber.c:1818
+#: ../libgaim/protocols/jabber/jabber.c:1833
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libgaim/protocols/jabber/jabber.c:1823
+#: ../libgaim/protocols/jabber/jabber.c:1838
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
@@ -8557,27 +8709,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1939
-#: ../libgaim/protocols/jabber/jabber.c:1941
+#: ../libgaim/protocols/jabber/jabber.c:1954
+#: ../libgaim/protocols/jabber/jabber.c:1956
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
-#: ../libgaim/protocols/jabber/jabber.c:1967
+#: ../libgaim/protocols/jabber/jabber.c:1982
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: ../libgaim/protocols/jabber/jabber.c:1972
+#: ../libgaim/protocols/jabber/jabber.c:1987
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../libgaim/protocols/jabber/jabber.c:1977
+#: ../libgaim/protocols/jabber/jabber.c:1992
 #: ../libgaim/protocols/simple/simple.c:1841
 msgid "Connect port"
 msgstr "連線埠"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:1981
+#: ../libgaim/protocols/jabber/jabber.c:1996
 #: ../libgaim/protocols/silc/silc.c:1851
 msgid "Connect server"
 msgstr "連結伺服器"
@@ -8626,14 +8778,14 @@
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
 
 #: ../libgaim/protocols/jabber/presence.c:318
-#: ../libgaim/protocols/oscar/oscar.c:2357
-#: ../libgaim/protocols/oscar/oscar.c:5068
+#: ../libgaim/protocols/oscar/oscar.c:2361
+#: ../libgaim/protocols/oscar/oscar.c:5075
 msgid "_Authorize"
 msgstr "給予認證(_A)"
 
 #: ../libgaim/protocols/jabber/presence.c:319
-#: ../libgaim/protocols/oscar/oscar.c:2359
-#: ../libgaim/protocols/oscar/oscar.c:5069
+#: ../libgaim/protocols/oscar/oscar.c:2363
+#: ../libgaim/protocols/oscar/oscar.c:5076
 msgid "_Deny"
 msgstr "拒絕(_D)"
 
@@ -8718,23 +8870,23 @@
 msgstr "使用者不存在"
 
 #: ../libgaim/protocols/msn/error.c:49
-msgid "Fully Qualified Domain Name missing"
+msgid "Fully qualified domain name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
 #: ../libgaim/protocols/msn/error.c:52
-msgid "Already Logged In"
+msgid "Already logged in"
 msgstr "已經登入"
 
 #: ../libgaim/protocols/msn/error.c:55
-msgid "Invalid Username"
-msgstr "使用者名稱無效"
+msgid "Invalid screen name"
+msgstr "帳號無效。"
 
 #: ../libgaim/protocols/msn/error.c:58
-msgid "Invalid Friendly Name"
+msgid "Invalid friendly name"
 msgstr "暱稱無效"
 
 #: ../libgaim/protocols/msn/error.c:61
-msgid "List Full"
+msgid "List full"
 msgstr "好友清單已滿"
 
 #: ../libgaim/protocols/msn/error.c:64
@@ -8787,7 +8939,7 @@
 msgstr "Switchboard 失敗"
 
 #: ../libgaim/protocols/msn/error.c:102
-msgid "Notify Transfer failed"
+msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
 #: ../libgaim/protocols/msn/error.c:106
@@ -8798,14 +8950,14 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:123
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:125
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #: ../libgaim/protocols/msn/error.c:116
-msgid "Service Temporarily Unavailable"
+msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
 #: ../libgaim/protocols/msn/error.c:119
@@ -8839,7 +8991,7 @@
 msgstr "伺服器目前不提供服務"
 
 #: ../libgaim/protocols/msn/error.c:141
-msgid "Peer Notification server down"
+msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
 #: ../libgaim/protocols/msn/error.c:144
@@ -8896,7 +9048,7 @@
 msgstr "伺服器太忙碌"
 
 #: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1310
+#: ../libgaim/protocols/oscar/oscar.c:1314
 #: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
 #: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
@@ -9000,7 +9152,7 @@
 
 #: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
 #: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/sametime/sametime.c:3232
+#: ../libgaim/protocols/sametime/sametime.c:3270
 #: ../libgaim/protocols/yahoo/yahoo.c:3032
 #: ../libgaim/protocols/yahoo/yahoo.c:3038
 #, c-format
@@ -9100,7 +9252,7 @@
 
 #. put a link to the actual profile URL
 #: ../libgaim/protocols/msn/msn.c:1370
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1109
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1113
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
@@ -9114,13 +9266,13 @@
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3669
-#: ../libgaim/protocols/qq/buddy_info.c:43
+#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/qq/buddy_info.c:45
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "年齡"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:51
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "職業"
@@ -9206,7 +9358,7 @@
 msgid "Home Phone 2"
 msgstr "住家電話2"
 
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3681
+#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3688
 msgid "Home Address"
 msgstr "住家地址"
 
@@ -9243,7 +9395,7 @@
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3698
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Company"
 msgstr "公司名稱"
 
@@ -9264,7 +9416,7 @@
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3689
+#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3696
 msgid "Work Address"
 msgstr "工作地址"
 
@@ -9311,7 +9463,7 @@
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:60
 #: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
@@ -9376,19 +9528,19 @@
 
 #: ../libgaim/protocols/msn/nexus.c:146
 #: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/qq/qq_proxy.c:243
+#: ../libgaim/protocols/qq/qq_proxy.c:322
+#: ../libgaim/protocols/qq/qq_proxy.c:367
+#: ../libgaim/protocols/qq/qq_proxy.c:400
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
 #: ../libgaim/protocols/yahoo/yahoochat.c:1357
 #: ../libgaim/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
@@ -9511,7 +9663,7 @@
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3409
+#: ../libgaim/protocols/oscar/oscar.c:3413
 #: ../libgaim/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
@@ -9638,7 +9790,7 @@
 
 #: ../libgaim/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
-msgstr "您所輸入的暱稱無效。"
+msgstr "您所輸入的帳號無效。"
 
 #: ../libgaim/protocols/novell/nmuser.c:1879
 msgid "Required parameters not passed in"
@@ -9678,8 +9830,8 @@
 msgstr "密碼已過期"
 
 #: ../libgaim/protocols/novell/nmuser.c:1909
-msgid "Invalid password"
-msgstr "密碼無效"
+msgid "Incorrect password"
+msgstr "密碼錯誤"
 
 #: ../libgaim/protocols/novell/nmuser.c:1912
 msgid "User not found"
@@ -9716,16 +9868,16 @@
 msgstr "Master archive 設定錯誤"
 
 #: ../libgaim/protocols/novell/nmuser.c:1937
-msgid "Invalid username or password"
-msgstr "使用者名稱或密碼無效"
+msgid "Incorrect screen name or password"
+msgstr "錯誤的帳號或密碼"
 
 #: ../libgaim/protocols/novell/nmuser.c:1940
-msgid "Could not recognize the host of the username you entered"
-msgstr "無法辦識您所輸入的主機或使用者名稱"
+msgid "Could not recognize the host of the screen name you entered"
+msgstr "無法辦識您所輸入的帳號內的主機名稱"
 
 #: ../libgaim/protocols/novell/nmuser.c:1943
 msgid ""
-"Your account has been disabled because too many invalid passwords were "
+"Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
@@ -9738,8 +9890,8 @@
 msgstr "您的好友人數已達上限"
 
 #: ../libgaim/protocols/novell/nmuser.c:1953
-msgid "You have entered an invalid username"
-msgstr "您輸入了無效的使用者名稱"
+msgid "You have entered an incorrect screen name"
+msgstr "您輸入了無效的帳號"
 
 #: ../libgaim/protocols/novell/nmuser.c:1956
 msgid "An error occurred while updating the directory"
@@ -10059,117 +10211,118 @@
 msgstr "檔案「%s」大小為 %s,超過了 %s 這個上限。"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libgaim/protocols/oscar/oscar.c:121
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libgaim/protocols/oscar/oscar.c:122
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libgaim/protocols/oscar/oscar.c:123
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libgaim/protocols/oscar/oscar.c:124
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
 #  XXX 可能是誤譯
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libgaim/protocols/oscar/oscar.c:126
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libgaim/protocols/oscar/oscar.c:127
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-#: ../libgaim/protocols/oscar/oscar.c:127
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
 #: ../libgaim/protocols/oscar/oscar.c:128
-msgid "Not supported by client"
-msgstr "用戶端不支援"
+msgid "Obsolete SNAC"
+msgstr "過時的 SNAC"
 
 #: ../libgaim/protocols/oscar/oscar.c:129
-msgid "Refused by client"
-msgstr "被用戶端拒絕"
+msgid "Not supported by host"
+msgstr "伺服器不支援"
 
 #: ../libgaim/protocols/oscar/oscar.c:130
-msgid "Reply too big"
-msgstr "回覆太大了"
+msgid "Not supported by client"
+msgstr "用戶端不支援"
 
 #: ../libgaim/protocols/oscar/oscar.c:131
+msgid "Refused by client"
+msgstr "被用戶端拒絕"
+
+#: ../libgaim/protocols/oscar/oscar.c:132
+msgid "Reply too big"
+msgstr "回覆太大了"
+
+#: ../libgaim/protocols/oscar/oscar.c:133
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libgaim/protocols/oscar/oscar.c:134
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libgaim/protocols/oscar/oscar.c:135
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libgaim/protocols/oscar/oscar.c:136
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libgaim/protocols/oscar/oscar.c:137
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libgaim/protocols/oscar/oscar.c:138
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libgaim/protocols/oscar/oscar.c:139
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libgaim/protocols/oscar/oscar.c:140
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: ../libgaim/protocols/oscar/oscar.c:139
+#: ../libgaim/protocols/oscar/oscar.c:141
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: ../libgaim/protocols/oscar/oscar.c:140
+#: ../libgaim/protocols/oscar/oscar.c:142
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: ../libgaim/protocols/oscar/oscar.c:141
+#: ../libgaim/protocols/oscar/oscar.c:143
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: ../libgaim/protocols/oscar/oscar.c:142
+#: ../libgaim/protocols/oscar/oscar.c:144
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: ../libgaim/protocols/oscar/oscar.c:143
+#: ../libgaim/protocols/oscar/oscar.c:145
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: ../libgaim/protocols/oscar/oscar.c:321
+#: ../libgaim/protocols/oscar/oscar.c:323
 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 "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-"(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能在使用與您想像不乎的字元編碼;"
-"如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」欄位指定。)"
-
-#: ../libgaim/protocols/oscar/oscar.c:424
+"(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能在使用與您想像不乎的字元"
+"編碼;如果您知道那是什麼編碼,請在您的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
+"欄位指定。)"
+
+#: ../libgaim/protocols/oscar/oscar.c:426
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -10177,46 +10330,46 @@
 "(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的用戶端程"
 "式。)"
 
-#: ../libgaim/protocols/oscar/oscar.c:603
+#: ../libgaim/protocols/oscar/oscar.c:605
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libgaim/protocols/oscar/oscar.c:606
+#: ../libgaim/protocols/oscar/oscar.c:608
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: ../libgaim/protocols/oscar/oscar.c:609 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/oscar/oscar.c:611 ../libgaim/protocols/silc/silc.c:693
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "聊天"
 
-#: ../libgaim/protocols/oscar/oscar.c:612
-#: ../libgaim/protocols/oscar/oscar.c:5852
+#: ../libgaim/protocols/oscar/oscar.c:614
+#: ../libgaim/protocols/oscar/oscar.c:5874
 msgid "Get File"
 msgstr "接收檔案"
 
-#: ../libgaim/protocols/oscar/oscar.c:619
+#: ../libgaim/protocols/oscar/oscar.c:621
 msgid "Games"
 msgstr "遊戲"
 
-#: ../libgaim/protocols/oscar/oscar.c:622
+#: ../libgaim/protocols/oscar/oscar.c:624
 msgid "Add-Ins"
 msgstr "模組"
 
-#: ../libgaim/protocols/oscar/oscar.c:625
+#: ../libgaim/protocols/oscar/oscar.c:627
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: ../libgaim/protocols/oscar/oscar.c:628
+#: ../libgaim/protocols/oscar/oscar.c:630
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: ../libgaim/protocols/oscar/oscar.c:631
+#: ../libgaim/protocols/oscar/oscar.c:633
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: ../libgaim/protocols/oscar/oscar.c:634
+#: ../libgaim/protocols/oscar/oscar.c:636
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -10227,88 +10380,88 @@
 # 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
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libgaim/protocols/oscar/oscar.c:639
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libgaim/protocols/oscar/oscar.c:642
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libgaim/protocols/oscar/oscar.c:645
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libgaim/protocols/oscar/oscar.c:648
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libgaim/protocols/oscar/oscar.c:651
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libgaim/protocols/oscar/oscar.c:654
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libgaim/protocols/oscar/oscar.c:657
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libgaim/protocols/oscar/oscar.c:660
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: ../libgaim/protocols/oscar/oscar.c:662
+#: ../libgaim/protocols/oscar/oscar.c:664
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: ../libgaim/protocols/oscar/oscar.c:665
+#: ../libgaim/protocols/oscar/oscar.c:667
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: ../libgaim/protocols/oscar/oscar.c:668
+#: ../libgaim/protocols/oscar/oscar.c:670
 msgid "Camera"
 msgstr "照相機"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
-#: ../libgaim/protocols/oscar/oscar.c:5629
+#: ../libgaim/protocols/oscar/oscar.c:688
+#: ../libgaim/protocols/oscar/oscar.c:5651
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: ../libgaim/protocols/oscar/oscar.c:690
-#: ../libgaim/protocols/oscar/oscar.c:5661
+#: ../libgaim/protocols/oscar/oscar.c:692
+#: ../libgaim/protocols/oscar/oscar.c:5683
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: ../libgaim/protocols/oscar/oscar.c:692
-#: ../libgaim/protocols/oscar/oscar.c:5647
+#: ../libgaim/protocols/oscar/oscar.c:694
+#: ../libgaim/protocols/oscar/oscar.c:5669
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libgaim/protocols/oscar/oscar.c:696
+#: ../libgaim/protocols/oscar/oscar.c:698
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: ../libgaim/protocols/oscar/oscar.c:700
+#: ../libgaim/protocols/oscar/oscar.c:702
 msgid "Online"
 msgstr "上線"
 
-#: ../libgaim/protocols/oscar/oscar.c:786
-#: ../libgaim/protocols/oscar/oscar.c:2804
+#: ../libgaim/protocols/oscar/oscar.c:788
+#: ../libgaim/protocols/oscar/oscar.c:2808
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: ../libgaim/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:797
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: ../libgaim/protocols/oscar/oscar.c:931
+#: ../libgaim/protocols/oscar/oscar.c:933
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10317,7 +10470,7 @@
 "無法連線至認證伺服器:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:939
+#: ../libgaim/protocols/oscar/oscar.c:941
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10326,20 +10479,20 @@
 "無法連線到 BOS 伺服器:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:979
+#: ../libgaim/protocols/oscar/oscar.c:981
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: ../libgaim/protocols/oscar/oscar.c:984
+#: ../libgaim/protocols/oscar/oscar.c:986
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1013
+#: ../libgaim/protocols/oscar/oscar.c:1015
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libgaim/protocols/oscar/oscar.c:1197
+#: ../libgaim/protocols/oscar/oscar.c:1199
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10349,27 +10502,30 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1282
+#: ../libgaim/protocols/oscar/oscar.c:1284
+#: ../libgaim/protocols/yahoo/yahoo.c:1905
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1287
+#: ../libgaim/protocols/oscar/oscar.c:1291
+#: ../libgaim/protocols/qq/login_logout.c:481
+#: ../libgaim/protocols/simple/simple.c:1035
 #: ../libgaim/protocols/yahoo/yahoo.c:1928
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1292
+#: ../libgaim/protocols/oscar/oscar.c:1296
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1296
+#: ../libgaim/protocols/oscar/oscar.c:1300
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1301
+#: ../libgaim/protocols/oscar/oscar.c:1305
 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."
@@ -10377,33 +10533,33 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1306
+#: ../libgaim/protocols/oscar/oscar.c:1310
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libgaim/protocols/oscar/oscar.c:1345
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libgaim/protocols/oscar/oscar.c:1350
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libgaim/protocols/oscar/oscar.c:1369
+#: ../libgaim/protocols/oscar/oscar.c:1373
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1383
+#: ../libgaim/protocols/oscar/oscar.c:1387
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libgaim/protocols/oscar/oscar.c:1384
+#: ../libgaim/protocols/oscar/oscar.c:1388
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1424
-#: ../libgaim/protocols/oscar/oscar.c:1467
+#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libgaim/protocols/oscar/oscar.c:1471
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -10412,69 +10568,69 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1427
-#: ../libgaim/protocols/oscar/oscar.c:1470
+#: ../libgaim/protocols/oscar/oscar.c:1431
+#: ../libgaim/protocols/oscar/oscar.c:1474
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1556
+#: ../libgaim/protocols/oscar/oscar.c:1560
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1559
+#: ../libgaim/protocols/oscar/oscar.c:1563
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: ../libgaim/protocols/oscar/oscar.c:1585
+#: ../libgaim/protocols/oscar/oscar.c:1589
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libgaim/protocols/oscar/oscar.c:1641
+#: ../libgaim/protocols/oscar/oscar.c:1645
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libgaim/protocols/oscar/oscar.c:2139
+#: ../libgaim/protocols/oscar/oscar.c:2143
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2148
+#: ../libgaim/protocols/oscar/oscar.c:2152
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2149
+#: ../libgaim/protocols/oscar/oscar.c:2153
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2181
+#: ../libgaim/protocols/oscar/oscar.c:2185
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2186
+#: ../libgaim/protocols/oscar/oscar.c:2190
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: ../libgaim/protocols/oscar/oscar.c:2188
+#: ../libgaim/protocols/oscar/oscar.c:2192
 msgid "_Request Authorization"
 msgstr "要求認證(_R)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2229
-#: ../libgaim/protocols/oscar/oscar.c:2236
-#: ../libgaim/protocols/oscar/oscar.c:2343
-#: ../libgaim/protocols/oscar/oscar.c:2367
-#: ../libgaim/protocols/oscar/oscar.c:5054
-#: ../libgaim/protocols/oscar/oscar.c:5106
+#: ../libgaim/protocols/oscar/oscar.c:2233
+#: ../libgaim/protocols/oscar/oscar.c:2240
+#: ../libgaim/protocols/oscar/oscar.c:2347
+#: ../libgaim/protocols/oscar/oscar.c:2371
+#: ../libgaim/protocols/oscar/oscar.c:5061
+#: ../libgaim/protocols/oscar/oscar.c:5113
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2235
+#: ../libgaim/protocols/oscar/oscar.c:2239
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2345
+#: ../libgaim/protocols/oscar/oscar.c:2349
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -10483,12 +10639,12 @@
 "使用者 %u 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2355
-#: ../libgaim/protocols/oscar/oscar.c:5066
+#: ../libgaim/protocols/oscar/oscar.c:2359
+#: ../libgaim/protocols/oscar/oscar.c:5073
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: ../libgaim/protocols/oscar/oscar.c:2367
+#: ../libgaim/protocols/oscar/oscar.c:2371
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10498,17 +10654,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2368
+#: ../libgaim/protocols/oscar/oscar.c:2372
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2375
+#: ../libgaim/protocols/oscar/oscar.c:2379
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2383
+#: ../libgaim/protocols/oscar/oscar.c:2387
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10521,7 +10677,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2391
+#: ../libgaim/protocols/oscar/oscar.c:2395
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10534,7 +10690,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2399
+#: ../libgaim/protocols/oscar/oscar.c:2403
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10547,34 +10703,34 @@
 "訊息為:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libgaim/protocols/oscar/oscar.c:2424
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2426
+#: ../libgaim/protocols/oscar/oscar.c:2430
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2430
+#: ../libgaim/protocols/oscar/oscar.c:2434
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2514
+#: ../libgaim/protocols/oscar/oscar.c:2518
 #, 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 送來的訊息,因為它們是無效的。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2523
+#: ../libgaim/protocols/oscar/oscar.c:2527
 #, 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 送來的訊息,因為它們太大了。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2532
+#: ../libgaim/protocols/oscar/oscar.c:2536
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -10584,102 +10740,102 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libgaim/protocols/oscar/oscar.c:2541
+#: ../libgaim/protocols/oscar/oscar.c:2545
 #, 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 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2550
+#: ../libgaim/protocols/oscar/oscar.c:2554
 #, 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 送來的訊息,因為您太邪惡了。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2559
+#: ../libgaim/protocols/oscar/oscar.c:2563
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2615
+#: ../libgaim/protocols/oscar/oscar.c:2619
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2676
+#: ../libgaim/protocols/oscar/oscar.c:2680
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2712
+#: ../libgaim/protocols/oscar/oscar.c:2716
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2712
-#: ../libgaim/protocols/oscar/oscar.c:2717
-#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2716
+#: ../libgaim/protocols/oscar/oscar.c:2721
 #: ../libgaim/protocols/oscar/oscar.c:2783
+#: ../libgaim/protocols/oscar/oscar.c:2787
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libgaim/protocols/oscar/oscar.c:2715
-#: ../libgaim/protocols/sametime/sametime.c:2360
+#: ../libgaim/protocols/oscar/oscar.c:2719
+#: ../libgaim/protocols/sametime/sametime.c:2398
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2779
+#: ../libgaim/protocols/oscar/oscar.c:2783
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: ../libgaim/protocols/oscar/oscar.c:2782
+#: ../libgaim/protocols/oscar/oscar.c:2786
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2808
+#: ../libgaim/protocols/oscar/oscar.c:2812
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: ../libgaim/protocols/oscar/oscar.c:2813
+#: ../libgaim/protocols/oscar/oscar.c:2817
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1174
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libgaim/protocols/oscar/oscar.c:2818
+#: ../libgaim/protocols/oscar/oscar.c:2822
 msgid "Capabilities"
 msgstr "相容性"
 
-#: ../libgaim/protocols/oscar/oscar.c:2836
+#: ../libgaim/protocols/oscar/oscar.c:2840
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libgaim/protocols/oscar/oscar.c:2936
+#: ../libgaim/protocols/oscar/oscar.c:2940
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3117
+#: ../libgaim/protocols/oscar/oscar.c:3121
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: ../libgaim/protocols/oscar/oscar.c:3338
+#: ../libgaim/protocols/oscar/oscar.c:3342
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3339
+#: ../libgaim/protocols/oscar/oscar.c:3343
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -10687,112 +10843,112 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3411
+#: ../libgaim/protocols/oscar/oscar.c:3415
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3424 ../libgaim/protocols/toc/toc.c:977
+#: ../libgaim/protocols/oscar/oscar.c:3428 ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3645
+#: ../libgaim/protocols/oscar/oscar.c:3652
 #: ../libgaim/protocols/silc/util.c:583
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../libgaim/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/oscar/oscar.c:3679
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libgaim/protocols/oscar/oscar.c:3676
-#: ../libgaim/protocols/qq/buddy_info.c:38
+#: ../libgaim/protocols/oscar/oscar.c:3683
+#: ../libgaim/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libgaim/protocols/oscar/oscar.c:3685
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libgaim/protocols/oscar/oscar.c:3692
+#: ../libgaim/protocols/oscar/oscar.c:3700
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libgaim/protocols/oscar/oscar.c:3697
+#: ../libgaim/protocols/oscar/oscar.c:3704
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: ../libgaim/protocols/oscar/oscar.c:3699
+#: ../libgaim/protocols/oscar/oscar.c:3706
 msgid "Division"
 msgstr "部門"
 
-#: ../libgaim/protocols/oscar/oscar.c:3700
+#: ../libgaim/protocols/oscar/oscar.c:3707
 msgid "Position"
 msgstr "職位"
 
-#: ../libgaim/protocols/oscar/oscar.c:3702
+#: ../libgaim/protocols/oscar/oscar.c:3709
 msgid "Web Page"
 msgstr "網頁"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libgaim/protocols/oscar/oscar.c:3760
+#: ../libgaim/protocols/oscar/oscar.c:3767
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libgaim/protocols/oscar/oscar.c:3800
+#: ../libgaim/protocols/oscar/oscar.c:3807
 #, 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 的帳號"
 
-#: ../libgaim/protocols/oscar/oscar.c:3805
+#: ../libgaim/protocols/oscar/oscar.c:3812
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libgaim/protocols/oscar/oscar.c:3831
+#: ../libgaim/protocols/oscar/oscar.c:3838
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libgaim/protocols/oscar/oscar.c:3859
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3854
+#: ../libgaim/protocols/oscar/oscar.c:3861
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libgaim/protocols/oscar/oscar.c:3885
+#: ../libgaim/protocols/oscar/oscar.c:3892
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libgaim/protocols/oscar/oscar.c:3888
+#: ../libgaim/protocols/oscar/oscar.c:3895
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3891
+#: ../libgaim/protocols/oscar/oscar.c:3898
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3894
+#: ../libgaim/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libgaim/protocols/oscar/oscar.c:3904
 #, 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:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3900
+#: ../libgaim/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -10800,19 +10956,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3903
+#: ../libgaim/protocols/oscar/oscar.c:3910
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3906
+#: ../libgaim/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libgaim/protocols/oscar/oscar.c:3916
+#: ../libgaim/protocols/oscar/oscar.c:3923
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -10821,26 +10977,26 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3917
 #: ../libgaim/protocols/oscar/oscar.c:3924
+#: ../libgaim/protocols/oscar/oscar.c:3931
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libgaim/protocols/oscar/oscar.c:3922
+#: ../libgaim/protocols/oscar/oscar.c:3929
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4097
+#: ../libgaim/protocols/oscar/oscar.c:4104
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4349
+#: ../libgaim/protocols/oscar/oscar.c:4356
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4350
+#: ../libgaim/protocols/oscar/oscar.c:4357
 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 "
@@ -10849,7 +11005,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4364
+#: ../libgaim/protocols/oscar/oscar.c:4371
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -10860,11 +11016,11 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4369
+#: ../libgaim/protocols/oscar/oscar.c:4376
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4413
+#: ../libgaim/protocols/oscar/oscar.c:4420
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -10875,11 +11031,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4418
+#: ../libgaim/protocols/oscar/oscar.c:4425
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4487
+#: ../libgaim/protocols/oscar/oscar.c:4494
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10890,17 +11046,17 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4489
-#: ../libgaim/protocols/oscar/oscar.c:4902
-#: ../libgaim/protocols/oscar/oscar.c:4916
+#: ../libgaim/protocols/oscar/oscar.c:4496
+#: ../libgaim/protocols/oscar/oscar.c:4909
+#: ../libgaim/protocols/oscar/oscar.c:4923
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libgaim/protocols/oscar/oscar.c:4593
+#: ../libgaim/protocols/oscar/oscar.c:4600
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libgaim/protocols/oscar/oscar.c:4594
+#: ../libgaim/protocols/oscar/oscar.c:4601
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -10909,16 +11065,16 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4797
-#: ../libgaim/protocols/oscar/oscar.c:4798
-#: ../libgaim/protocols/oscar/oscar.c:4803
-#: ../libgaim/protocols/oscar/oscar.c:4970
-#: ../libgaim/protocols/oscar/oscar.c:4971
-#: ../libgaim/protocols/oscar/oscar.c:4976
+#: ../libgaim/protocols/oscar/oscar.c:4804
+#: ../libgaim/protocols/oscar/oscar.c:4805
+#: ../libgaim/protocols/oscar/oscar.c:4810
+#: ../libgaim/protocols/oscar/oscar.c:4977
+#: ../libgaim/protocols/oscar/oscar.c:4978
+#: ../libgaim/protocols/oscar/oscar.c:4983
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libgaim/protocols/oscar/oscar.c:4900
+#: ../libgaim/protocols/oscar/oscar.c:4907
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -10927,12 +11083,12 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: ../libgaim/protocols/oscar/oscar.c:4900
-#: ../libgaim/protocols/oscar/oscar.c:4914
+#: ../libgaim/protocols/oscar/oscar.c:4907
+#: ../libgaim/protocols/oscar/oscar.c:4921
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libgaim/protocols/oscar/oscar.c:4914
+#: ../libgaim/protocols/oscar/oscar.c:4921
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10942,7 +11098,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5007
+#: ../libgaim/protocols/oscar/oscar.c:5014
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -10952,11 +11108,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libgaim/protocols/oscar/oscar.c:5013
+#: ../libgaim/protocols/oscar/oscar.c:5020
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: ../libgaim/protocols/oscar/oscar.c:5057
+#: ../libgaim/protocols/oscar/oscar.c:5064
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -10966,18 +11122,18 @@
 "%s"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5102
+#: ../libgaim/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libgaim/protocols/oscar/oscar.c:5103
+#: ../libgaim/protocols/oscar/oscar.c:5110
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5106
+#: ../libgaim/protocols/oscar/oscar.c:5113
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10987,113 +11143,113 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5107
+#: ../libgaim/protocols/oscar/oscar.c:5114
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libgaim/protocols/oscar/oscar.c:5143 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5150 ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libgaim/protocols/oscar/oscar.c:5183
+#: ../libgaim/protocols/oscar/oscar.c:5190
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5253
+#: ../libgaim/protocols/oscar/oscar.c:5260
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
 # XXX 好像不對,又好像沒問題
-#: ../libgaim/protocols/oscar/oscar.c:5415
+#: ../libgaim/protocols/oscar/oscar.c:5437
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5728
+#: ../libgaim/protocols/oscar/oscar.c:5750
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libgaim/protocols/oscar/oscar.c:5729
+#: ../libgaim/protocols/oscar/oscar.c:5751
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5775
+#: ../libgaim/protocols/oscar/oscar.c:5797
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5779
+#: ../libgaim/protocols/oscar/oscar.c:5801
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: ../libgaim/protocols/oscar/oscar.c:5783
+#: ../libgaim/protocols/oscar/oscar.c:5805
 #: ../libgaim/protocols/oscar/peer.c:990
 msgid "_Connect"
 msgstr "連線(_C)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5817
+#: ../libgaim/protocols/oscar/oscar.c:5839
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libgaim/protocols/oscar/oscar.c:5823
+#: ../libgaim/protocols/oscar/oscar.c:5845
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libgaim/protocols/oscar/oscar.c:5831
+#: ../libgaim/protocols/oscar/oscar.c:5853
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libgaim/protocols/oscar/oscar.c:5844
+#: ../libgaim/protocols/oscar/oscar.c:5866
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libgaim/protocols/oscar/oscar.c:5866
+#: ../libgaim/protocols/oscar/oscar.c:5888
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
 # NOTE Require意為「需要」,不是「要求」
-#: ../libgaim/protocols/oscar/oscar.c:5925
+#: ../libgaim/protocols/oscar/oscar.c:5947
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libgaim/protocols/oscar/oscar.c:5928
+#: ../libgaim/protocols/oscar/oscar.c:5950
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5933
+#: ../libgaim/protocols/oscar/oscar.c:5955
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: ../libgaim/protocols/oscar/oscar.c:5950
+#: ../libgaim/protocols/oscar/oscar.c:5972
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libgaim/protocols/oscar/oscar.c:5973
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libgaim/protocols/oscar/oscar.c:5958
+#: ../libgaim/protocols/oscar/oscar.c:5980
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6014
+#: ../libgaim/protocols/oscar/oscar.c:6036
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6059
+#: ../libgaim/protocols/oscar/oscar.c:6081
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6062
+#: ../libgaim/protocols/oscar/oscar.c:6084
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: ../libgaim/protocols/oscar/oscar.c:6063
+#: ../libgaim/protocols/oscar/oscar.c:6085
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -11101,102 +11257,73 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: ../libgaim/protocols/oscar/oscar.c:6080
+#: ../libgaim/protocols/oscar/oscar.c:6102
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6081
+#: ../libgaim/protocols/oscar/oscar.c:6103
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6082
+#: ../libgaim/protocols/oscar/oscar.c:6104
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libgaim/protocols/oscar/oscar.c:6251
+#: ../libgaim/protocols/oscar/oscar.c:6273
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6262
+#: ../libgaim/protocols/oscar/oscar.c:6284
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6266
+#: ../libgaim/protocols/oscar/oscar.c:6288
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6276
+#: ../libgaim/protocols/oscar/oscar.c:6298
 msgid "Set Privacy Options..."
 msgstr "設定隱私選項..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6283
+#: ../libgaim/protocols/oscar/oscar.c:6305
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6287
+#: ../libgaim/protocols/oscar/oscar.c:6309
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libgaim/protocols/oscar/oscar.c:6291
+#: ../libgaim/protocols/oscar/oscar.c:6313
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libgaim/protocols/oscar/oscar.c:6295
+#: ../libgaim/protocols/oscar/oscar.c:6317
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6302
+#: ../libgaim/protocols/oscar/oscar.c:6324
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6308
+#: ../libgaim/protocols/oscar/oscar.c:6330
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6313
+#: ../libgaim/protocols/oscar/oscar.c:6335
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: ../libgaim/protocols/oscar/oscar.c:6381
+#: ../libgaim/protocols/oscar/oscar.c:6403
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: ../libgaim/protocols/oscar/oscar.c:6384
+#: ../libgaim/protocols/oscar/oscar.c:6406
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../libgaim/protocols/oscar/oscar.c:6510
-#: ../libgaim/protocols/oscar/oscar.c:6512
-msgid "AIM/ICQ Protocol Plugin"
-msgstr "AIM/ICQ 協定模組"
-
-#: ../libgaim/protocols/oscar/oscar.c:6537
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
-#: ../libgaim/protocols/zephyr/zephyr.c:2980
-msgid "Encoding"
-msgstr "編碼"
-
-#: ../libgaim/protocols/oscar/oscar.c:6541
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸\n"
-"(較慢,但不會暴露您的 IP 位址)"
-
 #: ../libgaim/protocols/oscar/peer.c:623
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
@@ -11225,454 +11352,450 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: ../libgaim/protocols/qq/buddy_info.c:37
+#: ../libgaim/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "基本資訊"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libgaim/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "個人簡介"
 
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libgaim/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ 號碼"
 
-#: ../libgaim/protocols/qq/buddy_info.c:45
+#: ../libgaim/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "國家/地區"
 
-#: ../libgaim/protocols/qq/buddy_info.c:46
+#: ../libgaim/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "省/州"
 
 # XXX
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libgaim/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "星座"
 
 # XXX
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libgaim/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "生肖"
 
-#: ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "血型"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libgaim/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "大學/大專"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
-msgid "Email"
-msgstr "電子郵件"
-
 #: ../libgaim/protocols/qq/buddy_info.c:55
-msgid "Zipcode"
-msgstr "郵遞區號"
-
-#: ../libgaim/protocols/qq/buddy_info.c:56
-msgid "Cellphone Number"
-msgstr "行動電話號碼"
+msgid "Email"
+msgstr "電子郵件"
 
 #: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Zipcode"
+msgstr "郵遞區號"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+msgid "Cellphone Number"
+msgstr "行動電話號碼"
+
+#: ../libgaim/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#: ../libgaim/protocols/qq/buddy_info.c:62
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "水秤座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:62
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "雙魚座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:62
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "白羊座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:62
+#: ../libgaim/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "金牛座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:63
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "雙子座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:63
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "巨蟹座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:63
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "獅子座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:63
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "處女座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:63
+#: ../libgaim/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "天秤座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "天蠍座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "人馬座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libgaim/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "魔羯座"
 
-#: ../libgaim/protocols/qq/buddy_info.c:69
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "鼠"
 
-#: ../libgaim/protocols/qq/buddy_info.c:69
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "牛"
 
-#: ../libgaim/protocols/qq/buddy_info.c:69
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "虎"
 
-#: ../libgaim/protocols/qq/buddy_info.c:69
+#: ../libgaim/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "兔"
 
-#: ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "龍"
 
-#: ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "蛇"
 
-#: ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "馬"
 
-#: ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "羊"
 
-#: ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "雞"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "狗"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "豬"
 
-#: ../libgaim/protocols/qq/buddy_info.c:76
+#: ../libgaim/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "其他"
 
-#: ../libgaim/protocols/qq/buddy_info.c:477
-#: ../libgaim/protocols/qq/buddy_info.c:478
-msgid "Modify my information"
-msgstr "修改好友資訊"
-
 #: ../libgaim/protocols/qq/buddy_info.c:479
+#: ../libgaim/protocols/qq/buddy_info.c:480
+msgid "Modify my information"
+msgstr "修改好友資訊"
+
+#: ../libgaim/protocols/qq/buddy_info.c:481
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libgaim/protocols/qq/buddy_info.c:502
+#: ../libgaim/protocols/qq/buddy_info.c:504
 msgid "Your information has been updated"
 msgstr "成功修改了您的好友資訊。"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:205
-#: ../libgaim/protocols/qq/group_opt.c:133
+#: ../libgaim/protocols/qq/buddy_opt.c:207
+#: ../libgaim/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "您拒絕了 %d 的要求"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:206
-#: ../libgaim/protocols/qq/group_opt.c:134
+#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "請輸入原因:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
+#: ../libgaim/protocols/qq/buddy_opt.c:210
 msgid "Reject request"
 msgstr "拒絕"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:209
-#: ../libgaim/protocols/qq/group_opt.c:137
+#: ../libgaim/protocols/qq/buddy_opt.c:211
+#: ../libgaim/protocols/qq/group_opt.c:139
 msgid "Sorry, you are not my type..."
 msgstr "對不起,我和你合不來……"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
-#: ../libgaim/protocols/qq/group_im.c:134
-#: ../libgaim/protocols/qq/group_opt.c:123
-#: ../libgaim/protocols/qq/sys_msg.c:83 ../libgaim/protocols/qq/sys_msg.c:226
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+#: ../libgaim/protocols/qq/group_im.c:136
+#: ../libgaim/protocols/qq/group_opt.c:125
+#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:270
+#: ../libgaim/protocols/qq/buddy_opt.c:272
 #, fuzzy
 msgid "Add buddy with auth request fails"
 msgstr "連同認證要求的新增好友失敗"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:301
+#: ../libgaim/protocols/qq/buddy_opt.c:303
 msgid "You have successfully removed a buddy"
 msgstr "您成功移除了一個好友"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:329
+#: ../libgaim/protocols/qq/buddy_opt.c:331
 msgid "You have successfully removed yourself from a buddy"
 msgstr "您成功從一個好友的好友清單中移除了您自己"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:393
+#: ../libgaim/protocols/qq/buddy_opt.c:395
 #, c-format
 msgid "User %d needs authentication"
 msgstr "使用者 %d 需要認證"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
-#: ../libgaim/protocols/qq/group_join.c:132
+#: ../libgaim/protocols/qq/buddy_opt.c:397
+#: ../libgaim/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "請輸入要求"
 
 # XXX - 20061026
-#: ../libgaim/protocols/qq/buddy_opt.c:396
-#: ../libgaim/protocols/qq/group_join.c:133
+#: ../libgaim/protocols/qq/buddy_opt.c:398
+#: ../libgaim/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "想同我交個朋友嗎?"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
-#: ../libgaim/protocols/qq/group_opt.c:138
-#: ../libgaim/protocols/qq/sendqueue.c:198
+#: ../libgaim/protocols/qq/buddy_opt.c:399
+#: ../libgaim/protocols/qq/group_join.c:136
+#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libgaim/protocols/qq/sendqueue.c:200
 msgid "Send"
 msgstr "送出"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:404
+#: ../libgaim/protocols/qq/buddy_opt.c:406
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "成功將 %d 加入好友清單"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:501
+#: ../libgaim/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr "QQid 錯誤"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:502
+#: ../libgaim/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr "無效的 QQid"
 
-#: ../libgaim/protocols/qq/group.c:63
+#: ../libgaim/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID:"
 
-#: ../libgaim/protocols/qq/group.c:96
+#: ../libgaim/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "群組 ID:"
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libgaim/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "創立者"
 
-#: ../libgaim/protocols/qq/group.c:101
+#: ../libgaim/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "群組描述"
 
-#: ../libgaim/protocols/qq/group.c:107
+#: ../libgaim/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "認證"
 
-#: ../libgaim/protocols/qq/group.c:117
+#: ../libgaim/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ 群"
 
-#: ../libgaim/protocols/qq/group.c:118
+#: ../libgaim/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libgaim/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:120
+#: ../libgaim/protocols/qq/group_im.c:122
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "使用者 %d 要求加入群組 %d"
 
-#: ../libgaim/protocols/qq/group_im.c:121
-#: ../libgaim/protocols/qq/group_im.c:170
-#: ../libgaim/protocols/qq/sys_msg.c:178
+#: ../libgaim/protocols/qq/group_im.c:123
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/sys_msg.c:180
 #, c-format
 msgid "Reason: %s"
 msgstr "原因:%s"
 
-#: ../libgaim/protocols/qq/group_im.c:128
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/group_im.c:212
-#: ../libgaim/protocols/qq/group_im.c:247
-#: ../libgaim/protocols/qq/group_im.c:281
-#: ../libgaim/protocols/qq/group_join.c:227
-#: ../libgaim/protocols/qq/group_join.c:353
-#: ../libgaim/protocols/qq/group_opt.c:228
-#: ../libgaim/protocols/qq/group_opt.c:298
-#: ../libgaim/protocols/qq/group_opt.c:384
+#: ../libgaim/protocols/qq/group_im.c:130
+#: ../libgaim/protocols/qq/group_im.c:174
+#: ../libgaim/protocols/qq/group_im.c:214
+#: ../libgaim/protocols/qq/group_im.c:249
+#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libgaim/protocols/qq/group_opt.c:386
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
 
-#: ../libgaim/protocols/qq/group_im.c:131
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libgaim/protocols/qq/group_im.c:133
+#: ../libgaim/protocols/qq/group_opt.c:127
+#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr "允許"
 
-#: ../libgaim/protocols/qq/group_im.c:169
+#: ../libgaim/protocols/qq/group_im.c:171
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "管理人 %d 拒絕了您加入群組 %d"
 
-#: ../libgaim/protocols/qq/group_im.c:210
+#: ../libgaim/protocols/qq/group_im.c:212
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "管理人 %d 允許了您加入群組 %d"
 
-#: ../libgaim/protocols/qq/group_im.c:246
+#: ../libgaim/protocols/qq/group_im.c:248
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "您 [%d] 退出了群組「%d」"
 
-#: ../libgaim/protocols/qq/group_im.c:280
+#: ../libgaim/protocols/qq/group_im.c:282
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "群組「%2$d」新增了您 [%1$d]"
 
-#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_im.c:283
 msgid "This group has been added to your buddy list"
 msgstr "群組已新增至好友清單。"
 
-#: ../libgaim/protocols/qq/group_internal.c:39
+#: ../libgaim/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "我不是成員"
 
-#: ../libgaim/protocols/qq/group_internal.c:42
+#: ../libgaim/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "我是成員"
 
-#: ../libgaim/protocols/qq/group_internal.c:45
+#: ../libgaim/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "我正在要求加入"
 
-#: ../libgaim/protocols/qq/group_internal.c:48
+#: ../libgaim/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "我是管理人"
 
-#: ../libgaim/protocols/qq/group_internal.c:51
+#: ../libgaim/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "狀態不明"
 
-#: ../libgaim/protocols/qq/group_join.c:78
+#: ../libgaim/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr "這群組不容許外人加入"
 
-#: ../libgaim/protocols/qq/group_join.c:227
+#: ../libgaim/protocols/qq/group_join.c:229
 msgid "You have successfully exited the group"
 msgstr "您成功離開群組"
 
-#: ../libgaim/protocols/qq/group_join.c:251
+#: ../libgaim/protocols/qq/group_join.c:253
 msgid "QQ Group Auth"
 msgstr "QQ 群組認證"
 
-#: ../libgaim/protocols/qq/group_join.c:252
+#: ../libgaim/protocols/qq/group_join.c:254
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了您的認證"
 
-#: ../libgaim/protocols/qq/group_join.c:323
+#: ../libgaim/protocols/qq/group_join.c:325
 msgid "You inputted a group id outside the acceptable range"
 msgstr "指定的群組 ID 在有效範圍之外"
 
-#: ../libgaim/protocols/qq/group_join.c:354
+#: ../libgaim/protocols/qq/group_join.c:356
 msgid "Are you sure to exit this Qun?"
 msgstr "您確定要離開這個群 (Qun) 嗎?"
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libgaim/protocols/qq/group_join.c:358
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
 
-#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_join.c:361
 msgid "Go ahead"
 msgstr "確定"
 
-#: ../libgaim/protocols/qq/group_network.c:88
+#: ../libgaim/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "代碼 0x%02X:%s"
 
-#: ../libgaim/protocols/qq/group_network.c:89
+#: ../libgaim/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "群組操作錯誤"
 
-#: ../libgaim/protocols/qq/group_opt.c:122
-#: ../libgaim/protocols/qq/sys_msg.c:82
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84
 msgid "Do you wanna approve the request?"
 msgstr "允許這個要求?"
 
-#: ../libgaim/protocols/qq/group_opt.c:228
+#: ../libgaim/protocols/qq/group_opt.c:230
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:298
+#: ../libgaim/protocols/qq/group_opt.c:300
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:385
+#: ../libgaim/protocols/qq/group_opt.c:387
 msgid "You have successfully created a Qun"
 msgstr "成功建立了一個群 (Qun)"
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libgaim/protocols/qq/group_opt.c:389
 msgid "Would you like to set up the Qun details now?"
 msgstr "要立刻設定該群 (Qun) 的詳情嗎?"
 
-#: ../libgaim/protocols/qq/group_opt.c:388
+#: ../libgaim/protocols/qq/group_opt.c:390
 msgid "Setup"
 msgstr "設定"
 
-#: ../libgaim/protocols/qq/im.c:421
+#: ../libgaim/protocols/qq/im.c:423
 msgid "System Message"
 msgstr "系統訊息"
 
-#: ../libgaim/protocols/qq/im.c:565
+#: ../libgaim/protocols/qq/im.c:567
 msgid "Server ACK"
 msgstr "伺服器回應"
 
-#: ../libgaim/protocols/qq/im.c:565
+#: ../libgaim/protocols/qq/im.c:567
 msgid "Send IM fail\n"
 msgstr "送出即時訊息失敗\n"
 
-#: ../libgaim/protocols/qq/keep_alive.c:81
+#: ../libgaim/protocols/qq/keep_alive.c:83
 msgid "Keep alive error, seems connection lost!"
 msgstr "Keep alive 發生錯誤,連線似乎已突然中斷!"
 
-#: ../libgaim/protocols/qq/login_logout.c:404
+#: ../libgaim/protocols/qq/login_logout.c:406
 msgid "Request login token error!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:479
-msgid "Wrong password!"
-msgstr "密碼錯誤!"
-
-#: ../libgaim/protocols/qq/login_logout.c:482
+#: ../libgaim/protocols/qq/login_logout.c:484
 msgid "Unable to login, check debug log"
 msgstr "無法登入,請檢查除錯記錄"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
 #: ../libgaim/protocols/yahoo/yahoo.c:2356
 #: ../libgaim/protocols/yahoo/yahoo.c:2383
 #: ../libgaim/protocols/yahoo/yahoo.c:2490
@@ -11683,127 +11806,131 @@
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: ../libgaim/protocols/qq/qq.c:283
+#: ../libgaim/protocols/qq/qq.c:285
 msgid "QQ: Available"
 msgstr "QQ: 上線"
 
-#: ../libgaim/protocols/qq/qq.c:287
+#: ../libgaim/protocols/qq/qq.c:289
 msgid "QQ: Away"
 msgstr "QQ: 離開"
 
-#: ../libgaim/protocols/qq/qq.c:291
+#: ../libgaim/protocols/qq/qq.c:293
 msgid "QQ: Invisible"
 msgstr "QQ: 隱身"
 
-#: ../libgaim/protocols/qq/qq.c:295
+#: ../libgaim/protocols/qq/qq.c:297
 msgid "QQ: Offline"
 msgstr "QQ: 離線"
 
-#: ../libgaim/protocols/qq/qq.c:372
+#: ../libgaim/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "名稱無效"
 
 #  XXX 要覆查
-#: ../libgaim/protocols/qq/qq.c:442
+#: ../libgaim/protocols/qq/qq.c:444
 msgid "Selection"
 msgstr "選擇"
 
 #  XXX 要覆查
-#: ../libgaim/protocols/qq/qq.c:445
+#: ../libgaim/protocols/qq/qq.c:447
 msgid "Select a number"
 msgstr "選擇一個編號"
 
 #  XXX 要覆查
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libgaim/protocols/qq/qq.c:453
 msgid "Faces"
 msgstr "好友圖示"
 
 #  XXX 要覆查
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libgaim/protocols/qq/qq.c:458
 msgid "Change Your QQ Face"
 msgstr "更改您的 QQ 好友圖示"
 
 #  XXX 要覆查
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libgaim/protocols/qq/qq.c:459
 msgid "Change Face"
 msgstr "更改好友圖示"
 
-#: ../libgaim/protocols/qq/qq.c:458
+#: ../libgaim/protocols/qq/qq.c:460
 msgid "Update"
 msgstr "更新"
 
 #  NOTE 參見 qq.h
-#: ../libgaim/protocols/qq/qq.c:512
+#: ../libgaim/protocols/qq/qq.c:514
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:513
+#: ../libgaim/protocols/qq/qq.c:515
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間:</b>%s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:517
+#: ../libgaim/protocols/qq/qq.c:519
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>:%s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:518
+#: ../libgaim/protocols/qq/qq.c:520
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址:</b>%s:%d<br>\n"
 
 # XXX - 20061027
-#: ../libgaim/protocols/qq/qq.c:519
+#: ../libgaim/protocols/qq/qq.c:521
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址:</b>%s<br>\n"
 
 #: ../libgaim/protocols/qq/qq.c:524
+msgid "<i>Information below may not be accurate</i><br>\n"
+msgstr "【下列資訊可能不準確】<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間:</b>%s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:525
+#: ../libgaim/protocols/qq/qq.c:527
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址:</b>%s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:526
+#: ../libgaim/protocols/qq/qq.c:528
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間:</b>%s\n"
 
 # XXX - 20061027
-#: ../libgaim/protocols/qq/qq.c:530
+#: ../libgaim/protocols/qq/qq.c:532
 msgid "Login Information"
 msgstr "登入資訊"
 
-#: ../libgaim/protocols/qq/qq.c:802
+#: ../libgaim/protocols/qq/qq.c:804
 msgid "Modify My Information"
 msgstr "修改資訊"
 
-#: ../libgaim/protocols/qq/qq.c:805
+#: ../libgaim/protocols/qq/qq.c:807
 msgid "Change My Face"
 msgstr "修改好友圖示"
 
-#: ../libgaim/protocols/qq/qq.c:808 ../libgaim/protocols/toc/toc.c:1700
+#: ../libgaim/protocols/qq/qq.c:810 ../libgaim/protocols/toc/toc.c:1700
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: ../libgaim/protocols/qq/qq.c:811
+#: ../libgaim/protocols/qq/qq.c:813
 msgid "Show Login Information"
 msgstr "顯示登入資訊"
 
-#: ../libgaim/protocols/qq/qq.c:837
+#: ../libgaim/protocols/qq/qq.c:839
 msgid "Exit this QQ Qun"
 msgstr "離開這個 QQ 群 (Qun)"
 
-#: ../libgaim/protocols/qq/qq.c:922
+#: ../libgaim/protocols/qq/qq.c:924
 msgid "This function has not be implemented yet"
 msgstr "這項功能尚未實作"
 
-#: ../libgaim/protocols/qq/qq.c:922
+#: ../libgaim/protocols/qq/qq.c:924
 msgid "Please wait for new version"
 msgstr "請等待新版本推出"
 
@@ -11817,32 +11944,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:1004 ../libgaim/protocols/qq/qq.c:1006
+#: ../libgaim/protocols/qq/qq.c:1006 ../libgaim/protocols/qq/qq.c:1008
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libgaim/protocols/qq/qq.c:1025
+#: ../libgaim/protocols/qq/qq.c:1027
 msgid "Login in TCP"
 msgstr "以 TCP 登入"
 
-#: ../libgaim/protocols/qq/qq.c:1028
+#: ../libgaim/protocols/qq/qq.c:1030
 msgid "Login Hidden"
 msgstr "以隱藏狀態登入"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:493
+#: ../libgaim/protocols/qq/qq_proxy.c:494
 msgid "Socket send error"
 msgstr "寫入 Socket 途中發生錯誤"
 
 # XXX - 20061027
-#: ../libgaim/protocols/qq/qq_proxy.c:496
+#: ../libgaim/protocols/qq/qq_proxy.c:497
 msgid "Connection refused"
 msgstr "連線被拒"
 
-#: ../libgaim/protocols/qq/recv_core.c:304
+#: ../libgaim/protocols/qq/recv_core.c:306
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#: ../libgaim/protocols/qq/recv_core.c:314
+#: ../libgaim/protocols/qq/recv_core.c:316
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
@@ -11861,212 +11988,212 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-#: ../libgaim/protocols/qq/sendqueue.c:167
+#: ../libgaim/protocols/qq/sendqueue.c:169
 msgid "Connection lost!"
 msgstr "連線突然中斷!"
 
 #. cancel logging progress
-#: ../libgaim/protocols/qq/sendqueue.c:174
+#: ../libgaim/protocols/qq/sendqueue.c:176
 msgid "Login failed, no reply!"
 msgstr "登入失敗:沒有回應!"
 
-#: ../libgaim/protocols/qq/sendqueue.c:179
+#: ../libgaim/protocols/qq/sendqueue.c:181
 msgid "Connection timeout!"
 msgstr "連線已逾時!"
 
 # TODO 譯文有待改進 - 20061028
-#: ../libgaim/protocols/qq/sendqueue.c:179
+#: ../libgaim/protocols/qq/sendqueue.c:181
 msgid "User info is not updated"
 msgstr "無法更新使用者資訊"
 
-#: ../libgaim/protocols/qq/sendqueue.c:194
+#: ../libgaim/protocols/qq/sendqueue.c:196
 msgid "Send packet"
 msgstr "傳送封包中"
 
-#: ../libgaim/protocols/qq/sendqueue.c:196
+#: ../libgaim/protocols/qq/sendqueue.c:198
 msgid "Packets lost, send again?"
 msgstr "封包已遺失,重新送出?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:101
+#: ../libgaim/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr "您想將這個使用者加入到您的好友名單中嗎?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:153
+#: ../libgaim/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr "%s 已將您加入到他(她)的好友清單"
 
-#: ../libgaim/protocols/qq/sys_msg.c:156
+#: ../libgaim/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr "您想將他(她)加入到您的好友清單嗎?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s 已將您 [%s] 加入到他(她)的好友清單"
 
-#: ../libgaim/protocols/qq/sys_msg.c:177
+#: ../libgaim/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr "使用者「%s」拒絕了您的要求"
 
-#: ../libgaim/protocols/qq/sys_msg.c:197
+#: ../libgaim/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr "使用者「%s」允許了您的要求"
 
-#: ../libgaim/protocols/qq/sys_msg.c:220
+#: ../libgaim/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s 想要將您(%s)加入他(她)的好友清單"
 
-#: ../libgaim/protocols/qq/sys_msg.c:221
+#: ../libgaim/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "訊息:%s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:242
+#: ../libgaim/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 不在您的好友清單內"
 
 # FIXME fix the original string :P
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libgaim/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr "您要將他(她)加入您的好友清單嗎?"
 
-#: ../libgaim/protocols/sametime/sametime.c:414
+#: ../libgaim/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "連線關閉(寫入)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1260
+#: ../libgaim/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>群組名稱:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1261
+#: ../libgaim/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 群組 ID:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1263
+#: ../libgaim/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "關於群組 %s 的資訊"
 
-#: ../libgaim/protocols/sametime/sametime.c:1265
+#: ../libgaim/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes 通訊錄資訊"
 
-#: ../libgaim/protocols/sametime/sametime.c:1297
+#: ../libgaim/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "邀請整個群組進入會議室..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1307
+#: ../libgaim/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
-#: ../libgaim/protocols/sametime/sametime.c:1460
+#: ../libgaim/protocols/sametime/sametime.c:1498
 msgid "Sending Handshake"
 msgstr "傳送 Handshake"
 
-#: ../libgaim/protocols/sametime/sametime.c:1465
+#: ../libgaim/protocols/sametime/sametime.c:1503
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "等待 Handshake 回應"
 
-#: ../libgaim/protocols/sametime/sametime.c:1470
+#: ../libgaim/protocols/sametime/sametime.c:1508
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake收到回應,送出登入要求"
 
-#: ../libgaim/protocols/sametime/sametime.c:1475
+#: ../libgaim/protocols/sametime/sametime.c:1513
 msgid "Waiting for Login Acknowledgement"
 msgstr "等待登入要求的回應"
 
-#: ../libgaim/protocols/sametime/sametime.c:1480
+#: ../libgaim/protocols/sametime/sametime.c:1518
 msgid "Login Redirected"
 msgstr "重新導向登入"
 
-#: ../libgaim/protocols/sametime/sametime.c:1486
+#: ../libgaim/protocols/sametime/sametime.c:1524
 msgid "Forcing Login"
 msgstr "強行登入"
 
-#: ../libgaim/protocols/sametime/sametime.c:1490
+#: ../libgaim/protocols/sametime/sametime.c:1528
 msgid "Login Acknowledged"
 msgstr "登入要求收到回應"
 
 #  XXX 暫譯
-#: ../libgaim/protocols/sametime/sametime.c:1495
+#: ../libgaim/protocols/sametime/sametime.c:1533
 msgid "Starting Services"
 msgstr "啟動服務"
 
 # TODO 要覆查 - 20061027
-#: ../libgaim/protocols/sametime/sametime.c:1500
+#: ../libgaim/protocols/sametime/sametime.c:1538
 msgid "Connected"
 msgstr "已連結"
 
-#: ../libgaim/protocols/sametime/sametime.c:1598
+#: ../libgaim/protocols/sametime/sametime.c:1636
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "在伺服器「%s」上,有 Sametime 管理人發出了下列通告"
 
 # FIXME 這好像不通順 - 20061025
-#: ../libgaim/protocols/sametime/sametime.c:1603
+#: ../libgaim/protocols/sametime/sametime.c:1641
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-#: ../libgaim/protocols/sametime/sametime.c:1655
+#: ../libgaim/protocols/sametime/sametime.c:1693
 msgid "Connection reset"
 msgstr "連線重置"
 
-#: ../libgaim/protocols/sametime/sametime.c:1662
+#: ../libgaim/protocols/sametime/sametime.c:1700
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "讀取 Socket 時發生錯誤;%s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1685
-#: ../libgaim/protocols/sametime/sametime.c:3681
+#: ../libgaim/protocols/sametime/sametime.c:1723
+#: ../libgaim/protocols/sametime/sametime.c:3734
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
-#: ../libgaim/protocols/sametime/sametime.c:1723
+#: ../libgaim/protocols/sametime/sametime.c:1761
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
 
-#: ../libgaim/protocols/sametime/sametime.c:1897
+#: ../libgaim/protocols/sametime/sametime.c:1935
 msgid "Conference Closed"
 msgstr "會議室關閉"
 
-#: ../libgaim/protocols/sametime/sametime.c:2354
+#: ../libgaim/protocols/sametime/sametime.c:2392
 msgid "Unable to send message: "
 msgstr "無法送出訊息:"
 
-#: ../libgaim/protocols/sametime/sametime.c:2911
+#: ../libgaim/protocols/sametime/sametime.c:2949
 #, fuzzy
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
-#: ../libgaim/protocols/sametime/sametime.c:3202
+#: ../libgaim/protocols/sametime/sametime.c:3240
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../libgaim/protocols/sametime/sametime.c:3203
+#: ../libgaim/protocols/sametime/sametime.c:3241
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: ../libgaim/protocols/sametime/sametime.c:3204
+#: ../libgaim/protocols/sametime/sametime.c:3242
 msgid "Video Camera"
 msgstr "視訊"
 
-#: ../libgaim/protocols/sametime/sametime.c:3208
+#: ../libgaim/protocols/sametime/sametime.c:3246
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: ../libgaim/protocols/sametime/sametime.c:3242
+#: ../libgaim/protocols/sametime/sametime.c:3280
 #, c-format
 msgid ""
 "\n"
@@ -12075,7 +12202,7 @@
 "\n"
 "<b>支援:</b>%s"
 
-#: ../libgaim/protocols/sametime/sametime.c:3247
+#: ../libgaim/protocols/sametime/sametime.c:3285
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -12083,39 +12210,39 @@
 "\n"
 "<b>外部使用者<b>"
 
-#: ../libgaim/protocols/sametime/sametime.c:3353
+#: ../libgaim/protocols/sametime/sametime.c:3391
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libgaim/protocols/sametime/sametime.c:3354
+#: ../libgaim/protocols/sametime/sametime.c:3392
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題,同時發出一個邀請訊息給%s"
 
-#: ../libgaim/protocols/sametime/sametime.c:3358
+#: ../libgaim/protocols/sametime/sametime.c:3396
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libgaim/protocols/sametime/sametime.c:3360
+#: ../libgaim/protocols/sametime/sametime.c:3398
 msgid "Create"
 msgstr "建立"
 
-#: ../libgaim/protocols/sametime/sametime.c:3424
+#: ../libgaim/protocols/sametime/sametime.c:3462
 msgid "Available Conferences"
 msgstr "現有會議室"
 
-#: ../libgaim/protocols/sametime/sametime.c:3430
+#: ../libgaim/protocols/sametime/sametime.c:3468
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libgaim/protocols/sametime/sametime.c:3437
+#: ../libgaim/protocols/sametime/sametime.c:3475
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
-#: ../libgaim/protocols/sametime/sametime.c:3438
+#: ../libgaim/protocols/sametime/sametime.c:3476
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -12126,25 +12253,25 @@
 "議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libgaim/protocols/sametime/sametime.c:3443
+#: ../libgaim/protocols/sametime/sametime.c:3481
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libgaim/protocols/sametime/sametime.c:3533
+#: ../libgaim/protocols/sametime/sametime.c:3571
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
 #  XXX 要覆查 - 20061029
-#: ../libgaim/protocols/sametime/sametime.c:3538
+#: ../libgaim/protocols/sametime/sametime.c:3576
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libgaim/protocols/sametime/sametime.c:3585
+#: ../libgaim/protocols/sametime/sametime.c:3623
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社群伺服器"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libgaim/protocols/sametime/sametime.c:3607
+#: ../libgaim/protocols/sametime/sametime.c:3645
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -12154,62 +12281,62 @@
 "入。"
 
 # NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libgaim/protocols/sametime/sametime.c:3612
+#: ../libgaim/protocols/sametime/sametime.c:3650
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libgaim/protocols/sametime/sametime.c:3613
+#: ../libgaim/protocols/sametime/sametime.c:3651
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社群伺服器"
 
-#: ../libgaim/protocols/sametime/sametime.c:4075
+#: ../libgaim/protocols/sametime/sametime.c:4129
 msgid "<b>External User</b><br>"
 msgstr "<b>外部使用者</b><br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4078
+#: ../libgaim/protocols/sametime/sametime.c:4132
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>使用者帳號:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4084
+#: ../libgaim/protocols/sametime/sametime.c:4138
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>全名:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4090
+#: ../libgaim/protocols/sametime/sametime.c:4144
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>上次已知用戶端:</b>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4098
+#: ../libgaim/protocols/sametime/sametime.c:4152
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知(0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4105
+#: ../libgaim/protocols/sametime/sametime.c:4159
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>支援:</b>%s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4111
+#: ../libgaim/protocols/sametime/sametime.c:4165
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: ../libgaim/protocols/sametime/sametime.c:4254
-#: ../libgaim/protocols/sametime/sametime.c:5418
+#: ../libgaim/protocols/sametime/sametime.c:4317
+#: ../libgaim/protocols/sametime/sametime.c:5509
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libgaim/protocols/sametime/sametime.c:4257
-#: ../libgaim/protocols/sametime/sametime.c:5421
+#: ../libgaim/protocols/sametime/sametime.c:4320
+#: ../libgaim/protocols/sametime/sametime.c:5512
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4281
+#: ../libgaim/protocols/sametime/sametime.c:4344
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明的使用者 ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4282
+#: ../libgaim/protocols/sametime/sametime.c:4345
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -12218,16 +12345,16 @@
 "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者,以便新增至好友清單"
 "內。"
 
-#: ../libgaim/protocols/sametime/sametime.c:4287
+#: ../libgaim/protocols/sametime/sametime.c:4350
 msgid "Select User"
 msgstr "選擇使用者"
 
 #  TODO 請覆查,譯文有待改進
-#: ../libgaim/protocols/sametime/sametime.c:4357
+#: ../libgaim/protocols/sametime/sametime.c:4434
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者:找不到使用者"
 
-#: ../libgaim/protocols/sametime/sametime.c:4359
+#: ../libgaim/protocols/sametime/sametime.c:4436
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -12236,11 +12363,11 @@
 "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移"
 "除。"
 
-#: ../libgaim/protocols/sametime/sametime.c:4364
+#: ../libgaim/protocols/sametime/sametime.c:4441
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: ../libgaim/protocols/sametime/sametime.c:4936
+#: ../libgaim/protocols/sametime/sametime.c:5027
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -12249,63 +12376,63 @@
 "讀取檔案 %s 發生錯誤;\n"
 "%s\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5068
+#: ../libgaim/protocols/sametime/sametime.c:5159
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../libgaim/protocols/sametime/sametime.c:5073
+#: ../libgaim/protocols/sametime/sametime.c:5164
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libgaim/protocols/sametime/sametime.c:5076
+#: ../libgaim/protocols/sametime/sametime.c:5167
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libgaim/protocols/sametime/sametime.c:5078
+#: ../libgaim/protocols/sametime/sametime.c:5169
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libgaim/protocols/sametime/sametime.c:5080
+#: ../libgaim/protocols/sametime/sametime.c:5171
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libgaim/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5173
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libgaim/protocols/sametime/sametime.c:5131
+#: ../libgaim/protocols/sametime/sametime.c:5222
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libgaim/protocols/sametime/sametime.c:5170
+#: ../libgaim/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libgaim/protocols/sametime/sametime.c:5223
+#: ../libgaim/protocols/sametime/sametime.c:5314
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組:群組已存在"
 
-#: ../libgaim/protocols/sametime/sametime.c:5224
+#: ../libgaim/protocols/sametime/sametime.c:5315
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5227
-#: ../libgaim/protocols/sametime/sametime.c:5356
+#: ../libgaim/protocols/sametime/sametime.c:5318
+#: ../libgaim/protocols/sametime/sametime.c:5447
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: ../libgaim/protocols/sametime/sametime.c:5286
+#: ../libgaim/protocols/sametime/sametime.c:5377
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libgaim/protocols/sametime/sametime.c:5302
+#: ../libgaim/protocols/sametime/sametime.c:5393
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libgaim/protocols/sametime/sametime.c:5303
+#: ../libgaim/protocols/sametime/sametime.c:5394
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12315,26 +12442,26 @@
 "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好"
 "友清單。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5308
+#: ../libgaim/protocols/sametime/sametime.c:5399
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libgaim/protocols/sametime/sametime.c:5350
+#: ../libgaim/protocols/sametime/sametime.c:5441
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組:找不到群組"
 
-#: ../libgaim/protocols/sametime/sametime.c:5352
+#: ../libgaim/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在您的 Sametime 社群中,並沒有任何與「%s」相符的 Notes 通訊錄群組。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5393
+#: ../libgaim/protocols/sametime/sametime.c:5484
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄群組"
 
-#: ../libgaim/protocols/sametime/sametime.c:5394
+#: ../libgaim/protocols/sametime/sametime.c:5485
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -12342,12 +12469,12 @@
 "輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單"
 "中。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5442
+#: ../libgaim/protocols/sametime/sametime.c:5533
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libgaim/protocols/sametime/sametime.c:5443
+#: ../libgaim/protocols/sametime/sametime.c:5534
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12357,55 +12484,55 @@
 "「%s」可能指下列任何一個使用者。您可使用下面的按紐,把他(她)們新增至好友清"
 "單內,或向他(她)們發出訊息。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5475
+#: ../libgaim/protocols/sametime/sametime.c:5566
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libgaim/protocols/sametime/sametime.c:5476
+#: ../libgaim/protocols/sametime/sametime.c:5567
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5480
+#: ../libgaim/protocols/sametime/sametime.c:5571
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libgaim/protocols/sametime/sametime.c:5517
+#: ../libgaim/protocols/sametime/sametime.c:5608
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libgaim/protocols/sametime/sametime.c:5518
+#: ../libgaim/protocols/sametime/sametime.c:5609
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢您 Sametime 社群中符合的使用者。"
 
-#: ../libgaim/protocols/sametime/sametime.c:5521
+#: ../libgaim/protocols/sametime/sametime.c:5612
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/sametime/sametime.c:5624
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5537
+#: ../libgaim/protocols/sametime/sametime.c:5628
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libgaim/protocols/sametime/sametime.c:5632
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄群組"
 
-#: ../libgaim/protocols/sametime/sametime.c:5545
+#: ../libgaim/protocols/sametime/sametime.c:5636
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5642
+#: ../libgaim/protocols/sametime/sametime.c:5733
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5652
+#: ../libgaim/protocols/sametime/sametime.c:5743
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -13797,10 +13924,6 @@
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libgaim/protocols/simple/simple.c:1035
-msgid "Wrong Password"
-msgstr "錯誤的密碼"
-
 #: ../libgaim/protocols/simple/simple.c:1516
 #: ../libgaim/protocols/simple/simple.c:1558
 #: ../libgaim/protocols/simple/simple.c:1571
@@ -13817,8 +13940,8 @@
 msgstr "無法解析主機"
 
 #: ../libgaim/protocols/simple/simple.c:1647
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP 使用者名稱不可含有空白字元或「@」符號"
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "SIP 的帳號不可含有空白字元或「@」符號"
 
 #. *< type
 #. *< ui_requirement
@@ -13970,8 +14093,8 @@
 msgstr "未知的失敗原因:%s。"
 
 #: ../libgaim/protocols/toc/toc.c:549
-msgid "Incorrect nickname or password."
-msgstr "錯誤的暱稱或密碼"
+msgid "Incorrect screen name or password."
+msgstr "錯誤的帳號或密碼"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -14169,10 +14292,6 @@
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1905
-msgid "Invalid username."
-msgstr "使用者名稱無效。"
-
 #: ../libgaim/protocols/yahoo/yahoo.c:1919
 msgid "Normal authentication failed!"
 msgstr "無法以正常程序認證!"
@@ -14389,6 +14508,11 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
+#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libgaim/protocols/zephyr/zephyr.c:2980
+msgid "Encoding"
+msgstr "編碼"
+
 #: ../libgaim/protocols/yahoo/yahoo.c:3955
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
@@ -14823,7 +14947,7 @@
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libgaim/proxy.c:1673
+#: ../libgaim/proxy.c:1676
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
@@ -14851,7 +14975,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: ../libgaim/server.c:686
+#: ../libgaim/server.c:674
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14860,12 +14984,12 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../libgaim/server.c:691
+#: ../libgaim/server.c:679
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../libgaim/server.c:695
+#: ../libgaim/server.c:683
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -14921,95 +15045,138 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2429
+#: ../libgaim/util.c:2433
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-#: ../libgaim/util.c:2430
+#: ../libgaim/util.c:2434
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr "在解析您的 %s 時發生錯誤。它們並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: ../libgaim/util.c:2893
+#: ../libgaim/util.c:2897
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libgaim/util.c:2896
+#: ../libgaim/util.c:2900
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libgaim/util.c:2922
+#: ../libgaim/util.c:2926
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libgaim/util.c:2934
+#: ../libgaim/util.c:2938
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libgaim/util.c:2942
+#: ../libgaim/util.c:2946
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libgaim/util.c:2948
+#: ../libgaim/util.c:2952
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libgaim/util.c:2956
+#: ../libgaim/util.c:2960
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libgaim/util.c:2962
+#: ../libgaim/util.c:2966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libgaim/util.c:3161 ../libgaim/util.c:3460
+#: ../libgaim/util.c:3165 ../libgaim/util.c:3463
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libgaim/util.c:3287
+#: ../libgaim/util.c:3291
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
 
-#: ../libgaim/util.c:3324
+#: ../libgaim/util.c:3326
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libgaim/util.c:3355
+#: ../libgaim/util.c:3357
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libgaim/util.c:3380
+#: ../libgaim/util.c:3382
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
 
+#~ msgid "Tag"
+#~ msgstr "標記"
+
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr "指定的好友不在 Evolution 聯絡人清單中。"
+
+#~ msgid "Invalid Username"
+#~ msgstr "使用者名稱無效"
+
+#~ msgid "Invalid password"
+#~ msgstr "密碼無效"
+
+#~ msgid "Invalid username or password"
+#~ msgstr "使用者名稱或密碼無效"
+
+#~ msgid "AIM/ICQ Protocol Plugin"
+#~ msgstr "AIM/ICQ 協定模組"
+
+#~ msgid ""
+#~ "Always use AIM/ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸\n"
+#~ "(較慢,但不會暴露您的 IP 位址)"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Wrong password!"
+#~ msgstr "密碼錯誤!"
+
+#~ msgid "Wrong Password"
+#~ msgstr "錯誤的密碼"
+
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
+
+#~ msgid "Tab Options"
+#~ msgstr "分頁選項"
+
+#~ msgid "_Sounds while away"
+#~ msgstr "離開時仍發出音效(_S)"
+
 #~ msgid "Away / Idle"
 #~ msgstr "離開 / 閒置"
 
@@ -15022,9 +15189,6 @@
 #~ msgid "_Configure"
 #~ msgstr "設定(_C)"
 
-#~ msgid "Username:"
-#~ msgstr "使用者:"
-
 #, fuzzy
 #~ msgid "Host:"
 #~ msgstr "主機位址(_H):"
@@ -15053,18 +15217,12 @@
 #~ msgid "_Instant Messages:"
 #~ msgstr "即時訊息(_I):"
 
-#~ msgid "In hidden conversations"
-#~ msgstr "在隱藏交談"
-
 #~ msgid "C_hat Messages:"
 #~ msgstr "聊天訊息(_H):"
 
 #~ msgid "When my nick is said"
 #~ msgstr "當我的暱稱被提到"
 
-#~ msgid "System Tray Icon"
-#~ msgstr "系統工作匣圖示"
-
 #~ msgid "Displays an icon for Gaim in the system tray."
 #~ msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
@@ -15351,9 +15509,6 @@
 #~ msgid "Pounce Action"
 #~ msgstr "捕捉動作"
 
-#~ msgid "Custom..."
-#~ msgstr "使用者自定..."
-
 #~ msgid "_Warn"
 #~ msgstr "警告(_W)"