# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1071144422 0
# Node ID d26a33b1633522528461e28d4d93caa1682bc3fa
# Parent  4bc847ab3bb4af9b63403f8f85a0303b7f4cc8ff
[gaim-migrate @ 8482]
sorry about the delay on this po update

committer: Tailor Script <tailor@pidgin.im>

diff -r 4bc847ab3bb4 -r d26a33b16335 po/zh_TW.po
--- a/po/zh_TW.po	Thu Dec 11 01:23:32 2003 +0000
+++ b/po/zh_TW.po	Thu Dec 11 12:07:02 2003 +0000
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2003-11-30 07:57-0500\n"
+"POT-Creation-Date: 2003-12-07 20:02-0500\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -152,7 +152,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1769
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -168,12 +168,12 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2374 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2531 src/gtkpounce.c:411
+#: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:5537
-#: src/protocols/oscar/oscar.c:6138
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:5552
+#: src/protocols/oscar/oscar.c:6153
 msgid "Away"
 msgstr "離開"
 
@@ -185,16 +185,16 @@
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:574
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1928 src/main.c:323
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2333 src/main.c:329
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -312,20 +312,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 範例模組"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "一個 Gaim 的範例模組 - 請看介紹。"
 
 # NOTE 譯文更動 by Ambrose
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -419,15 +419,15 @@
 msgid "Change"
 msgstr "變更"
 
-#: plugins/history.c:75
+#: plugins/history.c:74
 msgid "History"
 msgstr "歷史記錄"
 
+#: plugins/history.c:76
+msgid "Shows recently logged conversations in new conversations."
+msgstr "顯示最近所記錄的交談到新的交談視窗中"
+
 #: plugins/history.c:77
-msgid "Shows recently logged conversations in new conversations."
-msgstr "顯示最近所記錄的交談到新的交談視窗中"
-
-#: plugins/history.c:78
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1010,8 +1010,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2208
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2365
+#: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1030,8 +1030,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:882
+#: src/gtkprefs.c:2267
 msgid "Conversations"
 msgstr "交談"
 
@@ -1106,173 +1106,172 @@
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:155
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:163
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」，不是「語」；下同 :-)
-#: src/about.c:164 src/about.c:197
+#: src/about.c:165 src/about.c:198
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:165 src/about.c:198
+#: src/about.c:166 src/about.c:199
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "Danish"
 msgstr "丹麥文"
 
 # XXX 唉，不能寫「世界文」吧......
-#: src/about.c:167
+#: src/about.c:168
 msgid "Esperanto"
 msgstr "世界語"
 
-#: src/about.c:168 src/about.c:199
+#: src/about.c:169 src/about.c:200
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:169 src/about.c:200
-msgid "Spanish"
-msgstr "西班牙文"
-
 #: src/about.c:170 src/about.c:201
+msgid "Spanish"
+msgstr "西班牙文"
+
+#: src/about.c:171 src/about.c:202
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:172 src/about.c:203
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:172
+#: src/about.c:173
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:173
+#: src/about.c:174
 msgid "Hungarian"
 msgstr "匈牙利文"
 
 # NOTE 香港譯「意大利文」，但這是 zh-TW :-)
-#: src/about.c:174 src/about.c:204
+#: src/about.c:175 src/about.c:205
 msgid "Italian"
 msgstr "義大利文"
 
-#: src/about.c:175 src/about.c:206
+#: src/about.c:176 src/about.c:207
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-#: src/about.c:176
+#: src/about.c:177
 msgid "Dutch; Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#: src/about.c:177
+#: src/about.c:178
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:179 src/about.c:208
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:181
+#: src/about.c:182
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:183 src/about.c:209
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:185 src/about.c:211
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:187
+#: src/about.c:188
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:194
+#: src/about.c:195
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:195
+#: src/about.c:196
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:196
+#: src/about.c:197
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:203
+#: src/about.c:204
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:205
+#: src/about.c:206
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:209
+#: src/about.c:210
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:211
+#: src/about.c:212
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:224 src/dialogs.c:2180 src/gtkrequest.c:198
-#: src/protocols/msn/msn.c:247
+#: src/about.c:225 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "關閉"
 
@@ -1302,56 +1301,54 @@
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:331
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1574
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1552 src/gtkblist.c:1731
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6188 src/protocols/oscar/oscar.c:6284
-#: src/protocols/oscar/oscar.c:6333 src/protocols/oscar/oscar.c:6415
-#: src/protocols/yahoo/yahoo.c:2261 src/request.h:852
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6203 src/protocols/oscar/oscar.c:6299
+#: src/protocols/oscar/oscar.c:6348 src/protocols/oscar/oscar.c:6430
+#: src/protocols/yahoo/yahoo.c:2291 src/request.h:852
 msgid "OK"
 msgstr "確定"
 
 #. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:371
-#: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
-#: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1575
-#: src/gtkblist.c:3511 src/gtkconn.c:148 src/gtkprivacy.c:568
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
-#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
+#: src/account.c:337 src/account.c:371 src/buddy_chat.c:367
+#: src/connection.c:194 src/dialogs.c:352 src/dialogs.c:364 src/dialogs.c:377
+#: src/dialogs.c:398 src/dialogs.c:1334 src/dialogs.c:1493 src/dialogs.c:1510
+#: src/dialogs.c:1553 src/gtkaccount.c:1622 src/gtkaccount.c:2091
+#: src/gtkblist.c:1732 src/gtkblist.c:3667 src/gtkconn.c:148
+#: src/gtkprivacy.c:568 src/gtkprivacy.c:581 src/gtkprivacy.c:606
+#: src/gtkprivacy.c:617 src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
 #: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6016 src/protocols/oscar/oscar.c:6189
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6334
-#: src/protocols/oscar/oscar.c:6399 src/protocols/oscar/oscar.c:6416
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2262
+#: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
+#: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
+#: src/protocols/oscar/oscar.c:6031 src/protocols/oscar/oscar.c:6204
+#: src/protocols/oscar/oscar.c:6300 src/protocols/oscar/oscar.c:6349
+#: src/protocols/oscar/oscar.c:6414 src/protocols/oscar/oscar.c:6431
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2292
 #: src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:361
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:368 src/dialogs.c:886 src/dialogs.c:1542 src/dialogs.c:2189
-#: src/gtkrequest.c:202 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
@@ -1375,16 +1372,16 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:551 src/gtkprefs.c:2267
+#: src/blist.c:566 src/gtkprefs.c:2269
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2074 src/gtkblist.c:2991
+#: src/blist.c:661 src/blist.c:849 src/blist.c:2060 src/gtkblist.c:3147
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1134
+#: src/blist.c:1149
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1396,29 +1393,29 @@
 "%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1143
+#: src/blist.c:1158
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1193 src/gtkaccount.c:159 src/gtkutils.c:844
-#: src/protocols/jabber/auth.c:117 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1208 src/gtkaccount.c:159 src/gtkutils.c:849
+#: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1548
+#: src/blist.c:1531
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2191
+#: src/blist.c:2177
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2193
+#: src/blist.c:2179
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3403
+#: src/buddy_chat.c:312 src/gtkblist.c:3559
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1434,12 +1431,12 @@
 msgid "Buddy Chat"
 msgstr "好友聊天室"
 
-#: src/buddy_chat.c:342
+#: src/buddy_chat.c:341
 msgid "Join Chat As:"
 msgstr "聊天室所屬帳號："
 
 #. Join button.
-#: src/buddy_chat.c:365
+#: src/buddy_chat.c:361
 msgid "Join"
 msgstr "加入"
 
@@ -1474,7 +1471,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1915
+#: src/conversation.c:1916
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1484,61 +1481,61 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1918
+#: src/conversation.c:1919
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2003
+#: src/conversation.c:2004
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2045
+#: src/conversation.c:2046
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2048
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2120
+#: src/conversation.c:2121
 #, c-format
 msgid "(+%d more)"
 msgstr "（以及另外 %d 個）"
 
-#: src/conversation.c:2122
+#: src/conversation.c:2123
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2404
+#: src/conversation.c:2405
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2406
+#: src/conversation.c:2407
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2408
+#: src/conversation.c:2409
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2410
+#: src/conversation.c:2411
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:307
+#: src/dialogs.c:200
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:310
+#: src/dialogs.c:203
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:219
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1550,37 +1547,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級，同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:228
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告？(_A)"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:235
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:348
 #, 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無法析別；可能有改進的空間
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:360
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:362 src/dialogs.c:363
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:372
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1588,11 +1585,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: src/dialogs.c:482 src/dialogs.c:483
+#: src/dialogs.c:375 src/dialogs.c:376
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:393
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1602,216 +1599,157 @@
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別；可能有改進的空間
-#: src/dialogs.c:503 src/dialogs.c:504
+#: src/dialogs.c:396 src/dialogs.c:397
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:652
+#: src/dialogs.c:542
 msgid "New Message"
 msgstr "新訊息"
 
-#: src/dialogs.c:670
+#: src/dialogs.c:560
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
-#: src/dialogs.c:686 src/dialogs.c:763
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "帳號(_S)："
 
-#: src/dialogs.c:701 src/dialogs.c:779 src/gtkpounce.c:358
+#: src/dialogs.c:589 src/dialogs.c:664 src/gtkpounce.c:358
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: src/dialogs.c:732
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:751
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "請輸入您所想要查詢對象的帳號。\n"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1034
-#: src/protocols/oscar/oscar.c:6484 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "設定使用者資訊"
-
-#: src/dialogs.c:854
-#, c-format
-msgid "Changing info for %s:"
-msgstr "修改 %s 的資訊："
-
-#: src/dialogs.c:969
+#: src/dialogs.c:757
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/dialogs.c:971
+#: src/dialogs.c:759
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:993
+#: src/dialogs.c:781
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。\n"
 
-#: src/dialogs.c:1011 src/protocols/jabber/buddy.c:249
+#: src/dialogs.c:799 src/protocols/jabber/buddy.c:249
 #: src/protocols/jabber/jabber.c:632
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:1021 src/gtkprefs.c:601 src/gtkprefs.c:1803
+#: src/dialogs.c:809 src/gtkprefs.c:601 src/gtkprefs.c:1805
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
 msgid "Description"
 msgstr "描述"
 
-#: src/dialogs.c:1157 src/dialogs.c:1174
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:1209 src/dialogs.c:1226
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:1311 src/dialogs.c:1337
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:1403
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:1405
+#: src/dialogs.c:1185
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題；或按「使用」來使用，同時不儲存它。"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:1480 src/dialogs.c:1488
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "離開原因："
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:1550
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:1699
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: src/dialogs.c:1717
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:1717
+#: src/dialogs.c:1489
 msgid "Alias chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:1718
+#: src/dialogs.c:1490
 msgid "Please enter an aliased name for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1734
+#: src/dialogs.c:1506
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1734
+#: src/dialogs.c:1506
 msgid "Alias contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1735
+#: src/dialogs.c:1507
 msgid "Please enter an aliased name for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:1766
+#: src/dialogs.c:1538
 msgid "_Screenname"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:1771 src/gtkblist.c:842 src/gtkblist.c:930 src/gtkblist.c:949
+#: src/dialogs.c:1543 src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/dialogs.c:1775
+#: src/dialogs.c:1547
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:1776
+#: src/dialogs.c:1548
 msgid "Alias buddy"
 msgstr "為好友加上別名"
 
 # NOTE 這個譯句應該沒有問題。（執行「別名」來看實際使用情況）
 # NOTE 但我把「下列人員...」改為新的譯句...。
-#: src/dialogs.c:1777
+#: src/dialogs.c:1549
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
 msgstr "請為這個好友設定別名，或者更改他（她）在好友清單中所記錄的帳號。"
 
-#: src/dialogs.c:1813 src/dialogs.c:1820
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "無法寫入到 %s。"
-
-#: src/dialogs.c:1844
-msgid "Save Log File"
-msgstr "儲存日誌檔"
-
-#: src/dialogs.c:1872
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "無法刪除檔案 %s。"
-
-#: src/dialogs.c:1891
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "您正試著將 %s 的日誌移除。您要繼續這個動作嗎？"
-
-#: src/dialogs.c:1892 src/dialogs.c:2062
-msgid "System Log"
-msgstr "系統日誌"
-
-#: src/dialogs.c:1893 src/dialogs.c:1895
-msgid "Remove Log"
-msgstr "移除日誌"
-
-#: src/dialogs.c:1923 src/dialogs.c:2083
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "無法開啟日誌檔 %s。"
-
-#: src/dialogs.c:2060
-#, c-format
-msgid "Conversations with %s"
-msgstr "與 %s 的交談"
-
-#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:637
-msgid "Date"
-msgstr "日期"
-
-#: src/dialogs.c:2161
-msgid "Log"
-msgstr "日誌"
-
-#: src/dialogs.c:2184
-msgid "Clear"
-msgstr "清除"
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1822,12 +1760,12 @@
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:693
+#: src/ft.c:713
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:695
+#: src/ft.c:715
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -1840,7 +1778,7 @@
 msgid "Size of the expander arrow"
 msgstr "展開器箭頭大小"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1861,11 +1799,11 @@
 "    選項:\n"
 "       -h, --help [commmand]    顯示指令的說明\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 並未執行（在工作階段 0）\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1877,14 +1815,14 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1896,17 +1834,17 @@
 "請注意上面由引號括起來的部份 - 如果你在 Shell 上執行這個，「&」\n"
 "必需被轉為脫逸字元，不然指令的執行就會到那裡為止。\n"
 "同時，下面的動作將會為帳號開啟一個沒有任何內容的交談視窗：\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "加入一個聊天室：\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "加入「PenguinLounge」這個聊天室。\n"
 "\n"
 "加入一個好友到您的好友清單中：\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "提示您加入「Penguin」到您的好友清單中。\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1923,15 +1861,15 @@
 msgid "boring default"
 msgstr "無聊（預設）"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2170
+#: src/gaimrc.c:1259 src/gtkblist.c:2327
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2171
+#: src/gaimrc.c:1261 src/gtkblist.c:2328
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2172
+#: src/gaimrc.c:1263 src/gtkblist.c:2329
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -1951,7 +1889,7 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3080
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -1968,12 +1906,12 @@
 msgid "Screenname:"
 msgstr "帳號："
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
+#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:163
 #: src/protocols/jabber/chat.c:56
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3143 src/gtkblist.c:3462
+#: src/gtkaccount.c:469 src/gtkblist.c:3299 src/gtkblist.c:3618
 msgid "Alias:"
 msgstr "別名："
 
@@ -2036,7 +1974,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:782 src/gtkprefs.c:1103
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -2052,7 +1990,7 @@
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:851 src/gtkprefs.c:1097
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
@@ -2103,27 +2041,27 @@
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1735
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4589
-#: src/protocols/oscar/oscar.c:6137 src/protocols/yahoo/yahoo.c:2056
+#: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4592
+#: src/protocols/oscar/oscar.c:6152 src/protocols/yahoo/yahoo.c:2086
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1776
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2066
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他 / 她的好友 %s%s%s"
 
-#: src/gtkaccount.c:2079
+#: src/gtkaccount.c:2080
 msgid ""
 "\n"
 "\n"
@@ -2133,184 +2071,190 @@
 "\n"
 "您想將他（她）加入到您的好友名單中嗎？"
 
-#: src/gtkaccount.c:2083
+#: src/gtkaccount.c:2084
 msgid "Gaim - Information"
 msgstr "Gaim - 資訊"
 
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
-#: src/gtkaccount.c:2089 src/gtkblist.c:3510 src/gtkconv.c:1257
-#: src/gtkconv.c:3110 src/gtkconv.c:4280 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+#: src/gtkaccount.c:2090 src/gtkblist.c:3666 src/gtkconv.c:1251
+#: src/gtkconv.c:3068 src/gtkconv.c:4273 src/gtkrequest.c:200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "加入"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:813
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
+#: src/gtkblist.c:816
+msgid "_IM"
+msgstr "即時訊息(_I)"
+
 #: src/gtkblist.c:818
-msgid "_IM"
-msgstr "即時訊息(_I)"
-
-#: src/gtkblist.c:820
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:820
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:844 src/gtkblist.c:932 src/gtkblist.c:954
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:905
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
+#: src/gtkblist.c:907
+msgid "Add a C_hat"
+msgstr "新增一個聊天室(_H)"
+
 #: src/gtkblist.c:909
-msgid "Add a C_hat"
-msgstr "新增一個聊天室(_H)"
-
-#: src/gtkblist.c:911
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:913
+#: src/gtkblist.c:911
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:925
+#: src/gtkblist.c:924
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:927
+#: src/gtkblist.c:926
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:951 src/gtkblist.c:986
+#: src/gtkblist.c:950 src/gtkblist.c:985
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:991
+#: src/gtkblist.c:990
 msgid "_Expand"
 msgstr "展開(_E)"
 
+# XXX 暫譯
+#: src/gtkblist.c:1392 src/gtkconv.c:3789
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
+
 #. Buddies menu
-#: src/gtkblist.c:1524
+#: src/gtkblist.c:1681
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1525
+#: src/gtkblist.c:1682
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友/新即時訊息(_I)"
 
-#: src/gtkblist.c:1526
+#: src/gtkblist.c:1683
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:1527
+#: src/gtkblist.c:1684
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友/取得使用者資訊(_U)"
 
-#: src/gtkblist.c:1529
+#: src/gtkblist.c:1686
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:1530
+#: src/gtkblist.c:1687
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:1531
+#: src/gtkblist.c:1688
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友/新增一個好友(_A)"
 
-#: src/gtkblist.c:1532
+#: src/gtkblist.c:1689
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友/新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1533
+#: src/gtkblist.c:1690
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友/新增一個群組(_G)"
 
-#: src/gtkblist.c:1535
+#: src/gtkblist.c:1692
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:1536
+#: src/gtkblist.c:1693
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1539
+#: src/gtkblist.c:1696
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:1540
+#: src/gtkblist.c:1697
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:1541
+#: src/gtkblist.c:1698
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1542
+#: src/gtkblist.c:1699
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
-#: src/gtkblist.c:1544
+#: src/gtkblist.c:1701
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:1545
-msgid "/Tools/_File Transfers..."
+#: src/gtkblist.c:1702
+msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:1546
+#: src/gtkblist.c:1703
 msgid "/Tools/Preferences"
 msgstr "/工具/偏好設定"
 
-#: src/gtkblist.c:1547
+#: src/gtkblist.c:1704
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:1549
+#: src/gtkblist.c:1706
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:1552
+#: src/gtkblist.c:1709
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:1553
+#: src/gtkblist.c:1710
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:1554
+#: src/gtkblist.c:1711
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:1555
+#: src/gtkblist.c:1712
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:1571
+#: src/gtkblist.c:1728
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:1571
+#: src/gtkblist.c:1728
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:1572
+#: src/gtkblist.c:1729
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:1600
+#: src/gtkblist.c:1757
 #, c-format
 msgid ""
 "\n"
@@ -2319,16 +2263,16 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: src/gtkblist.c:1661 src/protocols/oscar/oscar.c:5517
+#: src/gtkblist.c:1818 src/protocols/oscar/oscar.c:5532
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
-#: src/gtkblist.c:1673
+#: src/gtkblist.c:1830
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1688
+#: src/gtkblist.c:1845
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2336,7 +2280,7 @@
 "\n"
 "<b>帳號：</b>"
 
-#: src/gtkblist.c:1689
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2344,7 +2288,7 @@
 "\n"
 "<b>別名：</b>"
 
-#: src/gtkblist.c:1690
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2352,7 +2296,7 @@
 "\n"
 "<b>別名：</b>"
 
-#: src/gtkblist.c:1691
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2360,7 +2304,7 @@
 "\n"
 "<b>暱稱：</b>"
 
-#: src/gtkblist.c:1692
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2368,7 +2312,7 @@
 "\n"
 "<b>閒置：</b>"
 
-#: src/gtkblist.c:1693
+#: src/gtkblist.c:1850
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2376,7 +2320,7 @@
 "\n"
 "<b>警告：<b>"
 
-#: src/gtkblist.c:1695
+#: src/gtkblist.c:1852
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2384,7 +2328,7 @@
 "\n"
 "<b>介紹：</b>幽靈似的"
 
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2392,7 +2336,7 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1854
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2400,85 +2344,85 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:1965
+#: src/gtkblist.c:2122
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置（%d 小時 %d 分）"
 
-#: src/gtkblist.c:1967
+#: src/gtkblist.c:2124
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置（%d 分）"
 
-#: src/gtkblist.c:1972
+#: src/gtkblist.c:2129
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:1975
+#: src/gtkblist.c:2132
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:2168 src/gtkprefs.c:841 src/gtkprefs.c:1495
+#: src/gtkblist.c:2325 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "無"
 
-#: src/gtkblist.c:2235
+#: src/gtkblist.c:2392
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:2238
+#: src/gtkblist.c:2395
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:2398
 msgid "/Tools/Protocol Actions"
 msgstr "/工具/通訊協定相關設定"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2485
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2487
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:2348 src/gtkconv.c:1216
+#: src/gtkblist.c:2505 src/gtkconv.c:1210
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2511
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:2357 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2514 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2520
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:2366 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2523 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2528
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2536
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3085 src/protocols/yahoo/yahoo.c:2188
+#: src/gtkblist.c:3241 src/protocols/yahoo/yahoo.c:2218
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3108
+#: src/gtkblist.c:3264
 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. "
@@ -2487,42 +2431,42 @@
 "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
 "在好友清單中顯示。\n"
 
-#: src/gtkblist.c:3130 src/main.c:289
+#: src/gtkblist.c:3286 src/main.c:289
 msgid "Screen Name:"
 msgstr "帳號："
 
-#: src/gtkblist.c:3156 src/gtkblist.c:3473
+#: src/gtkblist.c:3312 src/gtkblist.c:3629
 msgid "Group:"
 msgstr "群組："
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3165 src/gtkblist.c:3443
+#: src/gtkblist.c:3321 src/gtkblist.c:3599
 msgid "Account:"
 msgstr "帳號："
 
-#: src/gtkblist.c:3410
+#: src/gtkblist.c:3566
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:3433
+#: src/gtkblist.c:3589
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名，或者關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3663
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:3507
+#: src/gtkblist.c:3663
 msgid "Add a new group"
 msgstr "新增群組"
 
-#: src/gtkblist.c:3508
+#: src/gtkblist.c:3664
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4009
+#: src/gtkblist.c:4181
 msgid "No actions available"
 msgstr "不允許任何動作"
 
@@ -2572,363 +2516,359 @@
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:185
+#: src/gtkconv.c:184
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:185 src/gtkft.c:1065
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: src/gtkconv.c:241
+#: src/gtkconv.c:240
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像：%s\n"
 
-#: src/gtkconv.c:311
+#: src/gtkconv.c:310
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入影像"
 
-#: src/gtkconv.c:615
+#: src/gtkconv.c:606
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:643
+#: src/gtkconv.c:634
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: src/gtkconv.c:664
+#: src/gtkconv.c:655
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: src/gtkconv.c:684
+#: src/gtkconv.c:675
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: src/gtkconv.c:780
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>請輸入搜尋字串\n"
-"</span>"
-
-#: src/gtkconv.c:787
-msgid "Search term: "
-msgstr "關鍵字："
-
-#: src/gtkconv.c:1224
+#: src/gtkconv.c:759
+msgid "Find"
+msgstr "搜尋"
+
+#: src/gtkconv.c:777
+msgid "_Search for:"
+msgstr "搜尋(_S)："
+
+#: src/gtkconv.c:1218
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1226 src/gtkprefs.c:774
+#: src/gtkconv.c:1220 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1235 src/gtkconv.c:3133
+#: src/gtkconv.c:1229 src/gtkconv.c:3091
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1244
+#: src/gtkconv.c:1238
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4265
+#: src/gtkconv.c:1249 src/gtkconv.c:3074 src/gtkconv.c:4258
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2372
+#: src/gtkconv.c:2325
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2380
+#: src/gtkconv.c:2333
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西，不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2436
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:2905
+#: src/gtkconv.c:2858
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:2922
+#: src/gtkconv.c:2875
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:2877
+msgid "/Conversation/_New Conversation..."
+msgstr "/交談/新交談(_N))..."
+
+#: src/gtkconv.c:2882
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:2884
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:2927
-msgid "/Conversation/Search..."
+#: src/gtkconv.c:2885
+msgid "/Conversation/Find..."
 msgstr "/交談/搜尋..."
 
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:2889
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:2891
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:2935
+#: src/gtkconv.c:2893
 msgid "/Conversation/_Get Info..."
 msgstr "/交談/取得資訊(_G)..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2895
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2942
+#: src/gtkconv.c:2900
 msgid "/Conversation/Insert _URL..."
 msgstr "/交談/插入 URL(_U)"
 
-#: src/gtkconv.c:2944
+#: src/gtkconv.c:2902
 msgid "/Conversation/Insert _Image..."
 msgstr "/交談/插入影像(_I)"
 
-#: src/gtkconv.c:2949
+#: src/gtkconv.c:2907
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:2951
+#: src/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2953
+#: src/gtkconv.c:2911
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:2913
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:2918
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:2922
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2965
+#: src/gtkconv.c:2923
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2966
+#: src/gtkconv.c:2924
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:2925
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3009
+#: src/gtkconv.c:2967
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3014
+#: src/gtkconv.c:2972
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3018
+#: src/gtkconv.c:2976
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3022
+#: src/gtkconv.c:2980
 msgid "/Conversation/Get Info..."
 msgstr "/交談/取得資訊..."
 
-#: src/gtkconv.c:3026
+#: src/gtkconv.c:2984
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3032
+#: src/gtkconv.c:2990
 msgid "/Conversation/Insert URL..."
 msgstr "/交談/插入 URL..."
 
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:2994
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3042
+#: src/gtkconv.c:3000
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3004
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3008
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3054
+#: src/gtkconv.c:3012
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3018
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3063
+#: src/gtkconv.c:3021
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3024
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
-#: src/gtkconv.c:5975
+#: src/gtkconv.c:3048 src/gtkconv.c:3050 src/gtkconv.c:3148 src/gtkconv.c:3150
+#: src/gtkconv.c:5968
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:3113 src/gtkconv.c:4283
+#: src/gtkconv.c:3071 src/gtkconv.c:4276
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3119 src/gtkconv.c:4268
+#: src/gtkconv.c:3077 src/gtkconv.c:4261
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3084
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3088
 msgid "Warn the user"
 msgstr "警告使用者"
 
-#: src/gtkconv.c:3137 src/gtkconv.c:3575
+#: src/gtkconv.c:3095 src/gtkconv.c:3534
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Block button
-#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3098 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3102
 msgid "Block the user"
 msgstr "封鎖使用者"
 
 #. Invite
-#: src/gtkconv.c:3202 src/gtkconv.c:5978
+#: src/gtkconv.c:3160 src/gtkconv.c:5971
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3205
+#: src/gtkconv.c:3163
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3202
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:3255
+#: src/gtkconv.c:3213
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3224
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3240
 msgid "Larger font size"
 msgstr "放大字體"
 
+#: src/gtkconv.c:3265
+msgid "Smaller font size"
+msgstr "縮小字體"
+
+#: src/gtkconv.c:3282
+msgid "Font Face"
+msgstr "字型"
+
 #: src/gtkconv.c:3294
-msgid "Normal font size"
-msgstr "正常字體"
+msgid "Foreground font color"
+msgstr "前景顏色"
 
 #: src/gtkconv.c:3306
-msgid "Smaller font size"
-msgstr "縮小字體"
-
-#: src/gtkconv.c:3323
-msgid "Font Face"
-msgstr "字型"
-
-#: src/gtkconv.c:3335
-msgid "Foreground font color"
-msgstr "前景顏色"
-
-#: src/gtkconv.c:3347
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3321
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3332
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkconv.c:3384
+#: src/gtkconv.c:3343
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtkconv.c:3444
+#: src/gtkconv.c:3403
 msgid "Topic:"
 msgstr "主題："
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3495
+#: src/gtkconv.c:3454
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3511
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3523
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4081
+#: src/gtkconv.c:4074
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4661 src/gtkconv.c:4693 src/gtkconv.c:4814 src/gtkconv.c:4881
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5222
+#: src/gtkconv.c:5215
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:5227
+#: src/gtkconv.c:5220
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:5233
+#: src/gtkconv.c:5226
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:5712 src/gtkconv.c:5715
+#: src/gtkconv.c:5705 src/gtkconv.c:5708
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
@@ -2957,128 +2897,138 @@
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到：</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:451
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:458
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:465
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:472
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:502
 msgid "Filename:"
 msgstr "檔名："
 
-#: src/gtkft.c:488
+#: src/gtkft.c:503
 msgid "Status:"
 msgstr "狀態："
 
-#: src/gtkft.c:489
+#: src/gtkft.c:504
 msgid "Speed:"
 msgstr "速度："
 
-#: src/gtkft.c:490
+#: src/gtkft.c:505
 msgid "Time Elapsed:"
 msgstr "經過時間："
 
-#: src/gtkft.c:491
+#: src/gtkft.c:506
 msgid "Time Remaining:"
 msgstr "尚需時間："
 
-#: src/gtkft.c:588
+#: src/gtkft.c:603
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:613
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
+# XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr "顯示下載細節"
-
-#: src/gtkft.c:608
-msgid "Hide download details"
-msgstr "隱藏下載細節"
+#: src/gtkft.c:622
+msgid "Show transfer details"
+msgstr "顯示傳輸細節"
+
+# XXX 暫譯
+#: src/gtkft.c:623
+msgid "Hide transfer details"
+msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:665 src/stock.c:86
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:675
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:882
+msgid "Canceled"
+msgstr "已取消"
+
+#: src/gtkft.c:884
+msgid "Failed"
+msgstr "失敗"
+
+#: src/gtkft.c:1042
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1051
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1064
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
-#: src/gtkft.c:1058
+#: src/gtkft.c:1089
 msgid "Gaim - Open..."
 msgstr "Gaim - 開啟..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
+#: src/gtkft.c:1091 src/protocols/toc/toc.c:2042
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/gtkft.c:1107
+#: src/gtkft.c:1138
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:688
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:700
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:710
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1891
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式，暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1899
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤：%s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1908
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1931
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
 # NOTE 這個處理的手法係由芬蘭文現任譯者Arto Alakulju提供的
-#: src/gtklog.c:244
+#: src/gtklog.c:255
 msgid "Conversations with"
 msgstr "交談："
 
@@ -3170,7 +3120,7 @@
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:407 src/main.c:335
 msgid "Sign on"
 msgstr "登入"
 
@@ -3182,8 +3132,8 @@
 msgid "Return from away"
 msgstr "由離開返回"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2052
+#: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2082
 msgid "Idle"
 msgstr "閒置"
 
@@ -3228,7 +3178,7 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:468 src/gtkprefs.c:2083
 msgid "Test"
 msgstr "測試"
 
@@ -3344,7 +3294,7 @@
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "顯示"
 
@@ -3420,23 +3370,23 @@
 msgid "Buddy List Toolbar"
 msgstr "好友清單工具列"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:836 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B)："
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:838 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:839 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:840 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:845 src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise window on events"
 msgstr "當事件發生時，將視窗提到最上方(_R)"
 
@@ -3452,7 +3402,7 @@
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:853 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
@@ -3468,190 +3418,195 @@
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
-#: src/gtkprefs.c:884
+# XXX 暫譯
+#: src/gtkprefs.c:861
+msgid "_Automatically expand contacts"
+msgstr "自動展開好友(_A)"
+
+#: src/gtkprefs.c:886
 msgid "_Placement:"
 msgstr "位置(_P)："
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:893
 msgid "Send _URLs as Links"
 msgstr "送出 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:896
 msgid "Show Formatting Toolbar"
 msgstr "顯示格式工具列"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:899
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:901
 msgid "_Tab Placement:"
 msgstr "標籤位置(_T)："
 
-#: src/gtkprefs.c:901
-msgid "Top"
-msgstr "視窗上方"
-
-#: src/gtkprefs.c:902
-msgid "Bottom"
-msgstr "視窗下方"
-
 #: src/gtkprefs.c:903
+msgid "Top"
+msgstr "視窗上方"
+
+#: src/gtkprefs.c:904
+msgid "Bottom"
+msgstr "視窗下方"
+
+#: src/gtkprefs.c:905
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:906
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:912
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:915
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:925
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:936
 msgid "Show status _icons on tabs"
 msgstr "在標籤上顯示好友狀態(_I)"
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "視窗"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "新視窗寬度(_W)："
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "新視窗高度(_H)："
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "輸入欄高度(_E)："
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "送出訊息後關閉視窗(_S)"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_L)"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab Completion (_O)"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "在視窗中顯示其他人進入的事件(_S)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "在視窗中顯示其他人離開的事件(_S)"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前，不用「毋須」，改為「不使用」
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1106
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1127
 msgid "_Host"
 msgstr "主機位址(_H)"
 
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1656
+#: src/gtkprefs.c:1144 src/protocols/irc/irc.c:555
+#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1660
 #: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1160
+#: src/gtkprefs.c:1162
 msgid "_User"
 msgstr "使用者(_U)"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1179
 msgid "Pa_ssword"
 msgstr "密碼(_S)"
 
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1216
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1216
-msgid "Mozilla"
-msgstr "Mozilla"
-
 #: src/gtkprefs.c:1217
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: src/gtkprefs.c:1218
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1219
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1220
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1229
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1270
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1274
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1284
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3660,63 +3615,63 @@
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1305
 msgid "Browser Options"
 msgstr "瀏覽器選項"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1306
 msgid "Open new _window by default"
 msgstr "預設為彈出一個新的視窗(_W)"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1322
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1325
 msgid "Log _Format:"
 msgstr "日誌格式(_F)："
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1329
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1331
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1386
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1387
 msgid "_No sounds when you log in"
 msgstr "登入期間不啟動音效(_N)"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1389
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1391
+#: src/gtkprefs.c:1393
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1394
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1396
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1396
+#: src/gtkprefs.c:1398
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1405
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1415
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3725,68 +3680,68 @@
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1470
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1472
 msgid "_Queue new messages when away"
 msgstr "在離開時，將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1475
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1478
 msgid "Seconds before _resending:"
 msgstr "送出回覆前的等待秒數(_R)："
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1481
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1481
-msgid "_Only send auto-response when idle"
-msgstr "只在閒置的時候送出自動回應(_O)"
-
 #: src/gtkprefs.c:1483
+msgid "_Only send auto-response when idle"
+msgstr "只在閒置的時候送出自動回應(_O)"
+
+#: src/gtkprefs.c:1485
 msgid "Send auto-response in _active conversations"
 msgstr "目前進行的交談也要送出自動回應(_A)"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1495
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T)："
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1498
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1501
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1503
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1511
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1512
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1514
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M)："
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1521
 msgid "Away m_essage:"
 msgstr "離開訊息(_M)："
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1583
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3801,7 +3756,7 @@
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1588
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3816,98 +3771,98 @@
 "<span weight=\"bold\">網站：</span>  %s\n"
 "<span weight=\"bold\">檔名：</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1769
 msgid "Load"
 msgstr "載入"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:582
-#: src/protocols/msn/msn.c:1344 src/protocols/trepia/trepia.c:401
+#: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
+#: src/protocols/msn/msn.c:1348 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "名稱"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1823
 msgid "Details"
 msgstr "詳細資料"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1950
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2057
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2064
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2087
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2225
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2261
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2262
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2261
+#: src/gtkprefs.c:2263
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2264
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2265
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2270
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2273
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2273
-msgid "Logging"
-msgstr "日誌"
-
-#: src/gtkprefs.c:2274
-msgid "Sounds"
-msgstr "音效"
-
 #: src/gtkprefs.c:2275
+msgid "Logging"
+msgstr "日誌"
+
+#: src/gtkprefs.c:2276
+msgid "Sounds"
+msgstr "音效"
+
+#: src/gtkprefs.c:2277
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2278
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2279
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4065,15 +4020,15 @@
 "launched: %s"
 msgstr "無法播放音效，因為無法執行所設定的音效指令：%s"
 
-#: src/gtkutils.c:291
+#: src/gtkutils.c:296
 msgid "Can't save icon file to disk."
 msgstr "無法儲存圖示檔案磁碟上。"
 
-#: src/gtkutils.c:326
+#: src/gtkutils.c:331
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#: src/log.c:82
+#: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
@@ -4092,25 +4047,25 @@
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <自動回應>：</b></font>%s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:532 src/log.c:666
+#: src/log.c:533 src/log.c:668
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案！</b></font>"
 
-#: src/log.c:542 src/log.c:676
+#: src/log.c:543 src/log.c:678
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案：%s</b></font>"
 
-#: src/log.c:546
+#: src/log.c:547
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:620
+#: src/log.c:621
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>：%s\n"
 
-#: src/log.c:680
+#: src/log.c:682
 msgid "Plain text"
 msgstr "純文字"
 
@@ -4127,7 +4082,7 @@
 msgstr "登入"
 
 #. full help text
-#: src/main.c:551
+#: src/main.c:549
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4161,7 +4116,7 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:566
+#: src/main.c:564
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
@@ -4190,8 +4145,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2333
-#: src/protocols/yahoo/yahoo.c:2434
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2363
+#: src/protocols/yahoo/yahoo.c:2464
 msgid "Available"
 msgstr "上線"
 
@@ -4204,10 +4159,10 @@
 msgstr "離開（只有好友可以看到我）"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6143 src/protocols/yahoo/yahoo.c:2050
-#: src/protocols/yahoo/yahoo.c:2353 src/protocols/yahoo/yahoo.c:2444
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
+#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:4609
+#: src/protocols/oscar/oscar.c:6158 src/protocols/yahoo/yahoo.c:2080
+#: src/protocols/yahoo/yahoo.c:2383 src/protocols/yahoo/yahoo.c:2474
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4263,7 +4218,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
+#: src/protocols/yahoo/yahoo_filexfer.c:140
 msgid "Unable to connect."
 msgstr "無法連結。"
 
@@ -4326,7 +4282,7 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3957
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3960
 msgid "UIN"
 msgstr "帳號"
 
@@ -4336,12 +4292,12 @@
 
 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3968 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3959
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3962
 msgid "Nick"
 msgstr "暱稱"
 
@@ -4356,18 +4312,18 @@
 
 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1282
-#: src/protocols/msn/msn.c:1524 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3200
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2610
-#: src/protocols/yahoo/yahoo.c:2632 src/protocols/yahoo/yahoo.c:2655
-#: src/protocols/yahoo/yahoo.c:2842 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1284
+#: src/protocols/msn/msn.c:1528 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2641
+#: src/protocols/yahoo/yahoo.c:2663 src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/yahoo/yahoo.c:2844 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "好友資訊"
 
@@ -4467,7 +4423,7 @@
 msgstr "名錄搜尋"
 
 #: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
-#: src/protocols/oscar/oscar.c:6498 src/protocols/toc/toc.c:1546
+#: src/protocols/oscar/oscar.c:6513 src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -4520,15 +4476,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5137
+#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5140
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5138
+#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:5141
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4581,50 +4537,50 @@
 msgstr "沒有設定主題"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:156
+#: src/protocols/irc/irc.c:158
 msgid "Channel:"
 msgstr "頻道："
 
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登入：%s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: src/protocols/irc/irc.c:357 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
 msgid "Read error"
 msgstr "讀取錯誤"
 
@@ -4637,25 +4593,25 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:534
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:535
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
+#: src/protocols/irc/irc.c:552 src/protocols/irc/msgs.c:197
 #: src/protocols/jabber/jabber.c:1140 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:561 src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:572
 msgid "Username"
 msgstr "使用者"
@@ -4684,7 +4640,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2713
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2744
 msgid "Realname"
 msgstr "姓名"
 
@@ -4839,68 +4795,68 @@
 msgid "Server requires SSL for login"
 msgstr "登入這個伺服器需要使用 SSL"
 
-#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:301
-#: src/protocols/jabber/auth.c:401 src/protocols/jabber/auth.c:413
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:311
+#: src/protocols/jabber/auth.c:411 src/protocols/jabber/auth.c:423
 msgid "Invalid response from server"
 msgstr "無效的伺服器回應"
 
-#: src/protocols/jabber/auth.c:93 src/protocols/jabber/auth.c:163
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:175
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
-#: src/protocols/jabber/auth.c:152 src/protocols/jabber/jabber.c:458
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/jabber.c:458
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
 # XXX 好像有些怪，譯文有待改進
-#: src/protocols/jabber/auth.c:322
+#: src/protocols/jabber/auth.c:332
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/auth.c:416
+#: src/protocols/jabber/auth.c:426
 msgid "Bad Protocol"
 msgstr "無效的協定"
 
 # NOTE Jabber 協定中 SASL Error 的一種，即 <encryption-required/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:419
+#: src/protocols/jabber/auth.c:429
 msgid "Encryption Required"
 msgstr "必須加密才可使用給定的認證機制"
 
-#: src/protocols/jabber/auth.c:422
+#: src/protocols/jabber/auth.c:432
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/auth.c:425
+#: src/protocols/jabber/auth.c:435
 msgid "Invalid Mechanism"
 msgstr "機制無效"
 
 # FIXME 要覆查譯文，很可能譯錯了
 # NOTE Jabber 協定中 SASL Error 的一種，即 <invalid-realm/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:427
+#: src/protocols/jabber/auth.c:437
 msgid "Invalid Realm"
 msgstr "領域無效"
 
 # XXX 要覆查譯文
 # NOTE Jabber 協定中 SASL Error 的一種，即 <mechanism-too-weak/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:430
+#: src/protocols/jabber/auth.c:440
 msgid "Mechanism Too Weak"
 msgstr "認證機制太弱"
 
-#: src/protocols/jabber/auth.c:433 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/auth.c:443 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:5560
 msgid "Not Authorized"
 msgstr "未認證"
 
-#: src/protocols/jabber/auth.c:436
+#: src/protocols/jabber/auth.c:446
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/auth.c:438
+#: src/protocols/jabber/auth.c:448
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
@@ -4917,7 +4873,7 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2740
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -4954,7 +4910,7 @@
 msgstr "電話"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2701
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2736
 msgid "Email"
 msgstr "電子郵件"
 
@@ -4975,7 +4931,7 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:3994
 msgid "Birthday"
 msgstr "生日"
 
@@ -5016,7 +4972,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
 msgid "Address"
 msgstr "地址"
 
@@ -5040,25 +4996,25 @@
 msgid "Jabber Profile"
 msgstr "Jabber 個人資料"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:905
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:908
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:916
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:924
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:929
+#: src/protocols/jabber/buddy.c:930
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
@@ -5314,14 +5270,14 @@
 msgstr "電子郵件"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3962
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3965
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4014
-#: src/protocols/oscar/oscar.c:4030 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "省／州"
@@ -5330,6 +5286,10 @@
 msgid "Phone"
 msgstr "電話"
 
+#: src/protocols/jabber/jabber.c:637
+msgid "Date"
+msgstr "日期"
+
 #: src/protocols/jabber/jabber.c:645
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊，請填寫下列資料："
@@ -5341,7 +5301,7 @@
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1942
+#: src/protocols/yahoo/yahoo.c:1972
 msgid "Connecting"
 msgstr "連線中"
 
@@ -5373,8 +5333,8 @@
 msgstr "長時間離開"
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:6139
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:6154
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -5407,6 +5367,11 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
+#: src/protocols/jabber/jabber.c:1034 src/protocols/oscar/oscar.c:6499
+#: src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5466,7 +5431,7 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
 
-#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -5525,22 +5490,22 @@
 msgstr "無法解析訊息。"
 
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2141 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1734
-#: src/protocols/yahoo/yahoo.c:1765 src/protocols/yahoo/yahoo.c:1830
+#: src/protocols/msn/notification.c:2146 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1764
+#: src/protocols/yahoo/yahoo.c:1795 src/protocols/yahoo/yahoo.c:1860
 msgid "Unable to connect"
 msgstr "無法連線"
 
 #: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
-#: src/protocols/msn/notification.c:2163
+#: src/protocols/msn/notification.c:2168
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2170
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2175
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2184
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2189
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
@@ -5807,7 +5772,7 @@
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2164
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2194
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態：</b>%s"
@@ -5818,26 +5783,26 @@
 msgstr "不在電腦前"
 
 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/yahoo/yahoo.c:2335 src/protocols/yahoo/yahoo.c:2435
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2062
+#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2465
 msgid "Be Right Back"
 msgstr "馬上回來"
 
 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2034
-#: src/protocols/yahoo/yahoo.c:2337 src/protocols/yahoo/yahoo.c:2436
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2064
+#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2466
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2042
-#: src/protocols/yahoo/yahoo.c:2345 src/protocols/yahoo/yahoo.c:2440
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2072
+#: src/protocols/yahoo/yahoo.c:2375 src/protocols/yahoo/yahoo.c:2470
 msgid "On The Phone"
 msgstr "電話中"
 
 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2046
-#: src/protocols/yahoo/yahoo.c:2349 src/protocols/yahoo/yahoo.c:2442
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2076
+#: src/protocols/yahoo/yahoo.c:2379 src/protocols/yahoo/yahoo.c:2472
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
@@ -5905,74 +5870,74 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的拒絕清單。"
 
-#: src/protocols/msn/msn.c:1283 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/msn/msn.c:1285 src/protocols/yahoo/yahoo.c:2642
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1351 src/protocols/oscar/oscar.c:3996
+#: src/protocols/msn/msn.c:1355 src/protocols/oscar/oscar.c:3999
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2725
+#: src/protocols/yahoo/yahoo.c:2752
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1358 src/protocols/oscar/oscar.c:3982
+#: src/protocols/msn/msn.c:1362 src/protocols/oscar/oscar.c:3985
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2737
+#: src/protocols/yahoo/yahoo.c:2760
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2731
+#: src/protocols/msn/msn.c:1370 src/protocols/yahoo/yahoo.c:2756
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1373 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/msn/msn.c:1377 src/protocols/yahoo/yahoo.c:2748
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1381 src/protocols/yahoo/yahoo.c:2743
+#: src/protocols/msn/msn.c:1385 src/protocols/yahoo/yahoo.c:2764
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
-#: src/protocols/msn/msn.c:1411 src/protocols/msn/msn.c:1418
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1408
+#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1422
+#: src/protocols/msn/msn.c:1429
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1447
-#: src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1451
+#: src/protocols/msn/msn.c:1458
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1463 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1467 src/protocols/msn/msn.c:1473
+#: src/protocols/msn/msn.c:1480
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1491
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/msn/msn.c:1489 src/protocols/msn/msn.c:1495
+#: src/protocols/yahoo/yahoo.c:2799
 msgid "Favorite Quote"
 msgstr "至愛名言"
 
-#: src/protocols/msn/msn.c:1499 src/protocols/yahoo/yahoo.c:2831
+#: src/protocols/msn/msn.c:1503 src/protocols/yahoo/yahoo.c:2835
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1510 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1514 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo.c:2850
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:2851
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2852
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
@@ -5986,15 +5951,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1632 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1636 src/protocols/msn/msn.c:1638
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1655 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1665
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6070,7 +6035,9 @@
 msgid "Unable to transfer to notification server"
 msgstr "無法傳送至通知伺服器"
 
-#: src/protocols/msn/notification.c:2104
+# NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
+# NOTE 譯文更動 by Ambrose
+#: src/protocols/msn/notification.c:2109
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6087,8 +6054,8 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN 伺服器將要關閉 %d 分鐘以進行維護，屆時您將會由伺服器上自動登出。請儘快結"
-"束您目前的交談。\n"
+"MSN 伺服器將要在 %d 分鐘內關閉以進行維護，屆時您將會由伺服器上自動登出。請儘"
+"快結束您目前的交談。\n"
 "\n"
 "當維護工作結束，您將可以再度登入。"
 
@@ -6151,7 +6118,7 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5208
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5211
 #: src/protocols/toc/toc.c:1259
 msgid "Join what group:"
 msgstr "加入哪個群組："
@@ -6316,7 +6283,8 @@
 msgstr "連線已建立，並已送出 Cookie"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
@@ -6324,7 +6292,8 @@
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:868
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo_filexfer.c:209
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
@@ -6384,21 +6353,21 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:1912 src/protocols/oscar/oscar.c:5646
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5661
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "（收取這個訊息時發生錯誤）"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2414
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -6407,46 +6376,46 @@
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6015
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6030
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2446
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2483
 #, 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 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎？"
 
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5129
-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5178
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2611
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6455,11 +6424,11 @@
 "使用者 %u 因為下列原因，想要將您加入他（她）的好友清單中：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5138
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2631
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6469,17 +6438,17 @@
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2632
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2646
+#: src/protocols/oscar/oscar.c:2647
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6492,7 +6461,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2655
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6505,7 +6474,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2663
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6518,34 +6487,34 @@
 "訊息為：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2684
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2690
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: src/protocols/oscar/oscar.c:2693
+#: src/protocols/oscar/oscar.c:2694
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2776
 #, 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 送來的訊息，因為它們都是無效的。"
 
-#: src/protocols/oscar/oscar.c:2784
+#: src/protocols/oscar/oscar.c:2785
 #, 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 送來的訊息，因為它們都太大了。"
 
-#: src/protocols/oscar/oscar.c:2793
+#: src/protocols/oscar/oscar.c:2794
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6553,105 +6522,105 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度太快。"
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2803
 #, 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 送來的訊息，因為他 / 她太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2811
+#: src/protocols/oscar/oscar.c:2812
 #, 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 送來的訊息，因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2820
+#: src/protocols/oscar/oscar.c:2821
 #, 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 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:6157
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4600
+#: src/protocols/oscar/oscar.c:6155
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4603
+#: src/protocols/oscar/oscar.c:6156
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2847
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2890
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號：</B> %s<BR><B>狀態：</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤：%s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2985
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出："
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3041
+#: src/protocols/oscar/oscar.c:3044
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊："
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3083
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3086
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6241
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6256
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6233
-#: src/protocols/yahoo/yahoo.c:2213
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6248
+#: src/protocols/yahoo/yahoo.c:2243
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3099
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3102
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3102
-msgid "Send Buddy List"
-msgstr "送出好友清單"
-
 #: src/protocols/oscar/oscar.c:3105
-msgid "ICQ Direct Connect"
-msgstr "ICQ 式直接連線"
+msgid "Send Buddy List"
+msgstr "送出好友清單"
 
 #: src/protocols/oscar/oscar.c:3108
+msgid "ICQ Direct Connect"
+msgstr "ICQ 式直接連線"
+
+#: src/protocols/oscar/oscar.c:3111
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3114
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6662,79 +6631,79 @@
 # 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
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3117
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3117
-msgid "ICQ Server Relay"
-msgstr "ICQ 伺服器轉送"
-
 #: src/protocols/oscar/oscar.c:3120
-msgid "Old ICQ UTF8"
-msgstr "舊式 ICQ UTF8"
+msgid "ICQ Server Relay"
+msgstr "ICQ 伺服器轉送"
 
 #: src/protocols/oscar/oscar.c:3123
+msgid "Old ICQ UTF8"
+msgstr "舊式 ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3126
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3129
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3132
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3135
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3138
 msgid "Video Chat"
 msgstr "視像聊天"
 
-#: src/protocols/oscar/oscar.c:3164
+#: src/protocols/oscar/oscar.c:3167
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "使用者名稱：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "警告等級：<b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3171
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上線時間：<b>%s</b><br>\n"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: src/protocols/oscar/oscar.c:3172
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成為成員的時間：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "閒置：<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3183
 msgid "Idle: <b>Active</b>"
 msgstr "閒置：<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3219
+#: src/protocols/oscar/oscar.c:3222
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3616
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3614
+#: src/protocols/oscar/oscar.c:3617
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6742,138 +6711,138 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3675
+#: src/protocols/oscar/oscar.c:3678
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線，因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3677
+#: src/protocols/oscar/oscar.c:3680
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3708
+#: src/protocols/oscar/oscar.c:3711
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:3977
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3982
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4002
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4005
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:4009
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4020 src/protocols/oscar/oscar.c:4036
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4022
+#: src/protocols/oscar/oscar.c:4025
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4041
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4043
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4046
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4049
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4052
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4058
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4108
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4129
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4133
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4147
+#: src/protocols/oscar/oscar.c:4150
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4171
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4173
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4201
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4207
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號以空白結束。"
 
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4210
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x：無法格式化帳號，因為要求的帳號太長。"
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4213
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6881,7 +6850,7 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4213
+#: src/protocols/oscar/oscar.c:4216
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6889,19 +6858,19 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4219
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址是無效的。"
 
-#: src/protocols/oscar/oscar.c:4219
+#: src/protocols/oscar/oscar.c:4222
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4229
+#: src/protocols/oscar/oscar.c:4232
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6910,20 +6879,20 @@
 "您的帳號目前被格式化如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4230 src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4233 src/protocols/oscar/oscar.c:4240
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4235
+#: src/protocols/oscar/oscar.c:4238
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4467
+#: src/protocols/oscar/oscar.c:4470
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4471
 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 "
@@ -6932,7 +6901,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4498
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6942,15 +6911,15 @@
 "truncated it for you."
 msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4503
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4517
+#: src/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4521
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6959,7 +6928,7 @@
 "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4561
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6969,15 +6938,15 @@
 "truncated it for you."
 msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4566
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4777
+#: src/protocols/oscar/oscar.c:4780
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4778
+#: src/protocols/oscar/oscar.c:4781
 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 "
@@ -6986,12 +6955,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失，可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4871
-#: src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4873 src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4879
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5042
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7000,15 +6969,15 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5042 src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5045 src/protocols/oscar/oscar.c:5058
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5043 src/protocols/oscar/oscar.c:5056
+#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5059
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7018,7 +6987,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5093
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7028,11 +6997,11 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5096
+#: src/protocols/oscar/oscar.c:5099
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5129
+#: src/protocols/oscar/oscar.c:5132
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7042,18 +7011,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5174
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5175
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7063,108 +7032,112 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5179
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5213 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5216 src/protocols/toc/toc.c:1264
 msgid "Exchange:"
 msgstr "聊天室號碼："
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5454
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5463
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間：</b>"
 
-#: src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:5475
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 位址：</b>"
 
-#: src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:5483
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性：</b>"
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5492
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>好友說明：</b>"
+
+#: src/protocols/oscar/oscar.c:5501
 msgid "<b>Available:</b> "
 msgstr "<b>上線：</b>"
 
-#: src/protocols/oscar/oscar.c:5504
+#: src/protocols/oscar/oscar.c:5519
 msgid "<b>Away Message:</b> "
 msgstr "<b>離開訊息：</b>"
 
-#: src/protocols/oscar/oscar.c:5513
+#: src/protocols/oscar/oscar.c:5528
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態：</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5547 src/protocols/yahoo/yahoo.c:2054
+#: src/protocols/oscar/oscar.c:5562 src/protocols/yahoo/yahoo.c:2084
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6010
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6023
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6026
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址，因此可能會有隱私上的風險。您想要繼續嗎？"
 
-#: src/protocols/oscar/oscar.c:6186
+#: src/protocols/oscar/oscar.c:6201
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:6217
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6225
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6240
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6254
+#: src/protocols/oscar/oscar.c:6269
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6275
+#: src/protocols/oscar/oscar.c:6290
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6276
+#: src/protocols/oscar/oscar.c:6291
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6282
+#: src/protocols/oscar/oscar.c:6297
 msgid "New screenname formatting:"
 msgstr "新的帳號格式："
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6346
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6390
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6393
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6379
+#: src/protocols/oscar/oscar.c:6394
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7172,64 +7145,64 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6393
+#: src/protocols/oscar/oscar.c:6408
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6409
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:6410
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6398
+#: src/protocols/oscar/oscar.c:6413
 msgid "Search"
 msgstr "搜尋"
 
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:6427
 msgid "Available Message:"
 msgstr "上線訊息："
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:6428
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作，但覺得很悶，同我聊聊天吧！"
 
-#: src/protocols/oscar/oscar.c:6491
+#: src/protocols/oscar/oscar.c:6506
 msgid "Set Available Message"
 msgstr "設定上線訊息"
 
-#: src/protocols/oscar/oscar.c:6505
+#: src/protocols/oscar/oscar.c:6520
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6528
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6539
 msgid "Format Screenname"
 msgstr "格式化帳號"
 
-#: src/protocols/oscar/oscar.c:6530
+#: src/protocols/oscar/oscar.c:6545
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6536
+#: src/protocols/oscar/oscar.c:6551
 msgid "Display Current Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6542
+#: src/protocols/oscar/oscar.c:6557
 msgid "Change Current Registered Address"
 msgstr "修改目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6551
+#: src/protocols/oscar/oscar.c:6566
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6574
 msgid "Search for Buddy by Email"
 msgstr "使用電子郵件地址搜尋好友"
 
@@ -7243,15 +7216,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6680 src/protocols/oscar/oscar.c:6682
+#: src/protocols/oscar/oscar.c:6695 src/protocols/oscar/oscar.c:6697
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6714
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:6719
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -7578,7 +7551,7 @@
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1396
+#: src/protocols/yahoo/yahoo.c:1426
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7588,11 +7561,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1399
+#: src/protocols/yahoo/yahoo.c:1429
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1472
+#: src/protocols/yahoo/yahoo.c:1502
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7601,62 +7574,62 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1475
+#: src/protocols/yahoo/yahoo.c:1505
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: src/protocols/yahoo/yahoo.c:1504
+#: src/protocols/yahoo/yahoo.c:1534
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1507
+#: src/protocols/yahoo/yahoo.c:1537
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: src/protocols/yahoo/yahoo.c:1510
+#: src/protocols/yahoo/yahoo.c:1540
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
-#: src/protocols/yahoo/yahoo.c:1557
+#: src/protocols/yahoo/yahoo.c:1587
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1559
+#: src/protocols/yahoo/yahoo.c:1589
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1795
+#: src/protocols/yahoo/yahoo.c:1695 src/protocols/yahoo/yahoo.c:1825
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:1820 src/protocols/yahoo/yahoo.c:1929
-#: src/protocols/yahoo/yahoo.c:1953
+#: src/protocols/yahoo/yahoo.c:1850 src/protocols/yahoo/yahoo.c:1959
+#: src/protocols/yahoo/yahoo.c:1983
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2036 src/protocols/yahoo/yahoo.c:2339
-#: src/protocols/yahoo/yahoo.c:2437
+#: src/protocols/yahoo/yahoo.c:2066 src/protocols/yahoo/yahoo.c:2369
+#: src/protocols/yahoo/yahoo.c:2467
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2341
-#: src/protocols/yahoo/yahoo.c:2438
+#: src/protocols/yahoo/yahoo.c:2068 src/protocols/yahoo/yahoo.c:2371
+#: src/protocols/yahoo/yahoo.c:2468
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2040 src/protocols/yahoo/yahoo.c:2343
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2070 src/protocols/yahoo/yahoo.c:2373
+#: src/protocols/yahoo/yahoo.c:2469
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2347
-#: src/protocols/yahoo/yahoo.c:2441
+#: src/protocols/yahoo/yahoo.c:2074 src/protocols/yahoo/yahoo.c:2377
+#: src/protocols/yahoo/yahoo.c:2471
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo.c:2351
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2078 src/protocols/yahoo/yahoo.c:2381
+#: src/protocols/yahoo/yahoo.c:2473
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -7664,78 +7637,78 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2144
+#: src/protocols/yahoo/yahoo.c:2142 src/protocols/yahoo/yahoo.c:2174
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2200
+#: src/protocols/yahoo/yahoo.c:2230
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2206
+#: src/protocols/yahoo/yahoo.c:2236
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/yahoo.c:2289
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
-#: src/protocols/yahoo/yahoo.c:2270
+#: src/protocols/yahoo/yahoo.c:2300
 msgid "Activate ID"
 msgstr "啟動 ID"
 
-#: src/protocols/yahoo/yahoo.c:2628
+#: src/protocols/yahoo/yahoo.c:2659
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>對不起，暫時並不支援內容被列為兒童不宜的個人資訊。</b><br><br>\n"
 
 # NOTE 注意：鏈結在譯文之下顯示，故譯成「以下」
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:2652
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2683
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結<br>"
 
-#: src/protocols/yahoo/yahoo.c:2651
+#: src/protocols/yahoo/yahoo.c:2682
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>對不起，暫時只支援英文的個人資訊。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2696
+#: src/protocols/yahoo/yahoo.c:2730 src/protocols/yahoo/yahoo.c:2731
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo.c:2756 src/protocols/yahoo/yahoo.c:2760
-#: src/protocols/yahoo/yahoo.c:2764
+#: src/protocols/yahoo/yahoo.c:2775 src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:2781
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2775 src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/yahoo/yahoo.c:2790 src/protocols/yahoo/yahoo.c:2793
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:2797
+#: src/protocols/yahoo/yahoo.c:2807
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2819
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2823
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/yahoo/yahoo.c:2825
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2831
 msgid "Member Since"
 msgstr "成為成員的時間"
 
@@ -7749,23 +7722,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3003 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/yahoo/yahoo.c:3006 src/protocols/yahoo/yahoo.c:3008
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3022
+#: src/protocols/yahoo/yahoo.c:3025
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:3030
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3032
+#: src/protocols/yahoo/yahoo.c:3035
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
@@ -7959,30 +7932,30 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/util.c:1793
+#: src/util.c:1790
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1796
+#: src/util.c:1793
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1827 src/util.c:1832 src/util.c:1837 src/util.c:1840
+#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:1828 src/util.c:1832 src/util.c:1846 src/util.c:1848
+#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: src/util.c:1828 src/util.c:1837 src/util.c:1846 src/util.c:1851
+#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2183
+#: src/util.c:2180
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -7998,6 +7971,56 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "Changing info for %s:"
+#~ msgstr "修改 %s 的資訊："
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "無法寫入到 %s。"
+
+#~ msgid "Save Log File"
+#~ msgstr "儲存日誌檔"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "無法刪除檔案 %s。"
+
+#~ msgid ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+#~ msgstr "您正試著將 %s 的日誌移除。您要繼續這個動作嗎？"
+
+#~ msgid "System Log"
+#~ msgstr "系統日誌"
+
+#~ msgid "Remove Log"
+#~ msgstr "移除日誌"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "無法開啟日誌檔 %s。"
+
+#~ msgid "Conversations with %s"
+#~ msgstr "與 %s 的交談"
+
+#~ msgid "Log"
+#~ msgstr "日誌"
+
+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#~ msgid ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+#~ msgstr ""
+#~ "<span weight='bold' size='larger'>請輸入搜尋字串\n"
+#~ "</span>"
+
+#~ msgid "/Conversation/Search..."
+#~ msgstr "/交談/搜尋..."
+
+#~ msgid "Normal font size"
+#~ msgstr "正常字體"
+
+#~ msgid "Hide download details"
+#~ msgstr "隱藏下載細節"
+
 #~ msgid "/Conversation/Send _File..."
 #~ msgstr "/交談/傳送檔案(_F)..."