# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1065701003 0
# Node ID ffabb88c901347e8246ef4badeaef0e8dc5e3979
# Parent  b4b92004334cd58f2b427f835922a4ecbe78effb
[gaim-migrate @ 7774]
yet another

committer: Tailor Script <tailor@pidgin.im>

diff -r b4b92004334c -r ffabb88c9013 po/zh_TW.po
--- a/po/zh_TW.po	Thu Oct 09 12:01:58 2003 +0000
+++ b/po/zh_TW.po	Thu Oct 09 12:03:23 2003 +0000
@@ -1,6 +1,6 @@
 # Gaim Traditional Chinese translation
-# Copyright (C) 2002-August 2003, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) May-August 2003, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-October 2003, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C)  May-October 2003, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -12,7 +12,7 @@
 # XXX   表示可能有問題，要複查；有問題需討論
 # ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
 # ----------------------------------------------------------
-# FIXME 未有統一譯法的字詞：Postal code、Profile、match、connect
+# FIXME 未有統一譯法的字詞：Postal code、Profile、match、connect、user info
 # FIXME「such」應為「斯」，即「這個」，但目前譯文沒有統一
 # XXX  「email address」應為「電子郵件地址」，但這樣寫太長了，
 #       是否可譯成「電郵地址」？
@@ -25,8 +25,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.69\n"
-"POT-Creation-Date: 2003-09-27 10:51-0400\n"
+"Project-Id-Version: Gaim 0.71\n"
+"POT-Creation-Date: 2003-10-08 05:50-0400\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"
@@ -43,14 +43,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "自動重新連線"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時，系統會自動幫你重新連線。"
 
@@ -86,7 +86,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1758
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -102,12 +102,12 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1797 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3587 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
+#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6064
 msgid "Away"
 msgstr "離開"
 
@@ -124,11 +124,11 @@
 msgstr "檔案傳輸"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1917 src/main.c:326
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2335 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:336
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -663,6 +663,61 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "透過 GNUTLS 提供 SSL 的支援。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:287
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+# TODO Untranslated
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -779,7 +834,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -826,8 +881,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1638
-#: src/gtkprefs.c:2268
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
+#: src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -846,8 +901,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2269
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
+#: src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "交談"
 
@@ -1074,11 +1129,89 @@
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:219 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "關閉"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:918
+msgid "New passwords do not match."
+msgstr "新密碼並不相符。"
+
+# NOTE 譯文更動 by Ambrose
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "請填妥整份表格的所有欄位。"
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "舊密碼"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "新密碼"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "新密碼（再次確認）"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "修改 %s 的密碼"
+
+#: src/account.c:321
+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:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
+#: 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:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
+#: src/protocols/yahoo/yahoo.c:2234 src/request.h:852
+msgid "OK"
+msgstr "確定"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1612
+#: src/gtkaccount.c:2080 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
+#: 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:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2235 src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "取消"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "更改 %s 的個人資訊"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "儲存"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim - 離開！"
@@ -1099,16 +1232,16 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:547 src/gtkprefs.c:2271
+#: src/blist.c:548 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:642 src/blist.c:811 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1919 src/protocols/msn/notification.c:1135
+#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1097
+#: src/blist.c:1103
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1120,54 +1253,30 @@
 "%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1106
+#: src/blist.c:1112
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1157 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
+#: src/protocols/jabber/buddy.c:571
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1475
+#: src/blist.c:1491
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2255
+#: src/blist.c:2135
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2257
+#: src/blist.c:2137
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
-#: src/browser.c:407 src/browser.c:435
-msgid ""
-"Communication with the browser failed. Please close all windows and try "
-"again."
-msgstr "和瀏覽器的溝通失敗。請關閉所有的視窗後重試。"
-
-#: src/browser.c:570 src/browser.c:590 src/browser.c:598
-msgid "Unable to open URL"
-msgstr "無法開啟網頁"
-
-#: src/browser.c:571
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
-
-#: src/browser.c:588
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "瀏覽器「%s」是無效的。"
-
-#: src/browser.c:595
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "執行「指令」時發生了錯誤：%s"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2931
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1192,27 +1301,6 @@
 msgid "Join"
 msgstr "加入"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4202
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 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:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "取消"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1231,24 +1319,11 @@
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "確定"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1257,7 +1332,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1267,61 +1342,61 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "（以及另外 %d 個）"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1333,37 +1408,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級，同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告？(_A)"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, 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:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, 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:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1371,11 +1446,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1385,405 +1460,204 @@
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別；可能有改進的空間
-#: src/dialogs.c:531 src/dialogs.c:532
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "新訊息"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "帳號(_S)："
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "請輸入您所想要查詢對象的帳號。\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "加入群組"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "新增群組"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "請給您新增的群組輸入名稱。"
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "加入"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "新增好友"
-
-#: src/dialogs.c:954
-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. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
-"在好友清單中顯示。\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "帳號"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "別名"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "群組"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "增加到"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "新增聊天室"
-
-#: src/dialogs.c:1348
-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/dialogs.c:1357
-msgid "Account:"
-msgstr "帳號："
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "別名："
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "群組："
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "設定使用者資訊"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "目錄資訊"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "設定 %s 的使用者資訊："
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "允許在 Web 搜尋來檢視您的個人資訊"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "名"
-
-# TODO: Untranslated
-# NOTE: 芬蘭文譯「其他名」，但中文這樣譯仍然是太怪了
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr ""
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "姓"
-
-# NOTE「小名」大概也可以，但「Maiden Name」通常係指未嫁時的「本姓」
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "本姓"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "城市"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "省╱州"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3731
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "國家"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4201
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "儲存"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "新密碼並不相符。"
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "請完成所有表格的填寫。"
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4420 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "修改密碼"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "修改 %s 的密碼："
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "舊密碼"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "新密碼"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "新密碼（再次確認）"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4406
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
+#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "修改 %s 的資訊："
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "以下是您所做查詢的結果："
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "記錄交談"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "找尋好友"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "以資訊找尋好友"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "以電子郵件地址來找尋好友"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3733
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "電子郵件"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "插入"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 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:2315 src/protocols/jabber/jabber.c:3725
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:594
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1807
-#: src/protocols/jabber/jabber.c:3739
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
 msgid "Description"
 msgstr "描述"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題；或按「使用」來使用，同時不儲存它。"
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "離開原因："
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "使用"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "笑一個！"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "為好友加上別名"
 
 # NOTE 這個譯句應該沒有問題。（執行「別名」來看實際使用情況）
 # NOTE 但我把「下列人員...」改為新的譯句...。
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
 msgstr "請為這個好友設定別名，或者更改他（她）在好友清單中所記錄的帳號。"
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "無法寫入到 %s。"
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "儲存日誌檔"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "無法刪除檔案 %s。"
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "清除日誌"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "真的要清除日誌嗎？"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "無法開啟日誌檔 %s。"
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "系統日誌"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
 msgid "Date"
 msgstr "日期"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "日誌"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "修改群組名稱"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "新名字"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "請為選取的群組輸入一個新的名稱。"
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1895,15 +1769,15 @@
 msgid "boring default"
 msgstr "無聊（預設）"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1600
+#: src/gaimrc.c:1267 src/gtkblist.c:1717
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1601
+#: src/gaimrc.c:1269 src/gtkblist.c:1718
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1602
+#: src/gaimrc.c:1271 src/gtkblist.c:1719
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -1912,7 +1786,7 @@
 msgid "Could not open config file %s."
 msgstr "無法開啟設定檔 %s。"
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:287
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1923,318 +1797,366 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:369
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:386
 msgid "Protocol:"
 msgstr "通訊協定："
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:391
 msgid "Screenname:"
 msgstr "帳號："
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:464 src/main.c:310 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+msgid "Alias:"
+msgstr "別名："
+
+#: src/gtkaccount.c:473
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:527
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:521
+#: src/gtkaccount.c:540
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:549
 msgid "Buddy icon file:"
 msgstr "好友圖示檔案："
 
-#: src/gtkaccount.c:539
+#: src/gtkaccount.c:558
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:564
 msgid "_Reset"
 msgstr "重置(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:625
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:746
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」，但講國語「毋須」會不通順，「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:753
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:760
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:767
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:774
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:781 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:814
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:818
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:834
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:850 src/gtkprefs.c:1106
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:859
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:863
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:871
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:876
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1208
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "顯示較多的選項"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:612
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s？"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1611 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "刪除"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3581 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1724
+msgid "Screen Name"
+msgstr "帳號"
+
+#: src/gtkaccount.c:1747 src/protocols/jabber/jabber.c:866
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1765
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:2055
+#, 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:2069
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"您想將他（她）加入到您的好友名單中嗎？"
+
+#: src/gtkaccount.c:2073
+msgid "Gaim - Information"
+msgstr "Gaim - 資訊"
+
+#: src/gtkaccount.c:2077
+msgid "Add buddy to your list?"
+msgstr "將使用者加入您的好友清單？"
+
+#: src/gtkaccount.c:2079 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3016 src/gtkconv.c:4190 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "加入"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "取得資訊(_G)"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "即時訊息(_I)"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "展開(_E)"
 
 #. Buddies menu
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友/新即時訊息(_I)"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友/取得使用者資訊(_U)"
 
-#: src/gtkblist.c:1015
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/好友/新增一個好友(_A)"
 
-#: src/gtkblist.c:1018
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/好友/新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1019
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/好友/新增一個群組(_G)"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:1031
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/工具/偏好設定"
 
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:1038
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:1039
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:1040
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:1041
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:1071
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "修改群組名稱"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "新名字"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "請為選取的群組輸入一個新的名稱。"
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2243,16 +2165,16 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: src/gtkblist.c:1130 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
-#: src/gtkblist.c:1142
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1156
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2260,7 +2182,7 @@
 "\n"
 "<b>帳號：</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2268,7 +2190,7 @@
 "\n"
 "<b>別名：</b>"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2276,7 +2198,7 @@
 "\n"
 "<b>暱稱：</b>"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2284,7 +2206,7 @@
 "\n"
 "<b>閒置：</b>"
 
-#: src/gtkblist.c:1160
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2292,7 +2214,7 @@
 "\n"
 "<b>警告：<b>"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2300,7 +2222,7 @@
 "\n"
 "<b>介紹：</b>幽靈似的"
 
-#: src/gtkblist.c:1163
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2308,7 +2230,7 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2316,81 +2238,129 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:1418
+#: src/gtkblist.c:1514
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置（%d 小時 %d 分）"
 
-#: src/gtkblist.c:1420
+#: src/gtkblist.c:1516
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置（%d 分）"
 
-#: src/gtkblist.c:1424
+#: src/gtkblist.c:1520
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:1427
+#: src/gtkblist.c:1523
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:1599 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
 msgid "None"
 msgstr "無"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1780
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1783
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:1668
+#: src/gtkblist.c:1786
 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:1751
+#: src/gtkblist.c:1870
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:1753
+#: src/gtkblist.c:1872
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:1771 src/gtkconv.c:1073
+#: src/gtkblist.c:1890 src/gtkconv.c:1096
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1777
+#: src/gtkblist.c:1896
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:1780 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:1905
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:1789 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:1794
+#: src/gtkblist.c:1913
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:1802
+#: src/gtkblist.c:1921
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:2871
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2168
+msgid "Add Buddy"
+msgstr "新增好友"
+
+#: src/gtkblist.c:2645
+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. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱，而這個設定將會"
+"在好友清單中顯示。\n"
+
+#: src/gtkblist.c:2667 src/main.c:292
+msgid "Screen Name:"
+msgstr "帳號："
+
+#: src/gtkblist.c:2693 src/gtkblist.c:3000
+msgid "Group:"
+msgstr "群組："
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2702 src/gtkblist.c:2971
+msgid "Account:"
+msgstr "帳號："
+
+#: src/gtkblist.c:2938
+msgid "Add Chat"
+msgstr "新增聊天室"
+
+#: src/gtkblist.c:2961
+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:3034
+msgid "Add Group"
+msgstr "加入群組"
+
+#: src/gtkblist.c:3034
+msgid "Add a new group"
+msgstr "新增群組"
+
+#: src/gtkblist.c:3035
+msgid "Please enter the name of the group to be added."
+msgstr "請給您新增的群組輸入名稱。"
+
+#: src/gtkblist.c:3547
 msgid "No actions available"
 msgstr "不允許任何動作"
 
@@ -2419,348 +2389,353 @@
 msgid "Reason Unknown."
 msgstr "理由不明。"
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "無法儲存影像：%s\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim - 插入影像"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - 邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3039
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3493
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:3022 src/gtkconv.c:4175
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2247
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2255
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西，不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2358
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2818
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2835
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2837
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2839
 msgid "/Conversation/View _Log..."
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2845
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2847
 msgid "/Conversation/_Get Info..."
 msgstr "/交談/取得資訊(_G)..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2849
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2854
 msgid "/Conversation/Insert _URL..."
 msgstr "/交談/插入 URL(_U)"
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2856
 msgid "/Conversation/Insert _Image..."
 msgstr "/交談/插入影像(_I)"
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2861
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2863
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2865
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2867
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2872
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2876
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2877
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2918
 msgid "/Conversation/View Log..."
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2923
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2927
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2931
 msgid "/Conversation/Get Info..."
 msgstr "/交談/取得資訊..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2935
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2941
 msgid "/Conversation/Insert URL..."
 msgstr "/交談/插入 URL..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2945
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2951
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2955
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2959
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2963
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2969
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2972
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2996 src/gtkconv.c:2998 src/gtkconv.c:3096 src/gtkconv.c:3098
+#: src/gtkconv.c:5957
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:3019 src/gtkconv.c:4193
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:3025 src/gtkconv.c:4178
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:3032
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3036
 msgid "Warn the user"
 msgstr "警告使用者"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3043 src/gtkconv.c:3478
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3046 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3050
 msgid "Block the user"
 msgstr "封鎖使用者"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3108 src/gtkconv.c:5960
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3111
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3150
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3161
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3172
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3188
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3200
 msgid "Normal font size"
 msgstr "正常字體"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3212
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3229
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3241
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3253
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3268
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3279
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3290
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3347
 msgid "Topic:"
 msgstr "主題："
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3398
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3455
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3467
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3961 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- 於 %s 的新交談 ----</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3965 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- 於 %s 的新交談 ----\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3998
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4682 src/gtkconv.c:4714 src/gtkconv.c:4835 src/gtkconv.c:4902
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5224
 msgid "Disable Animation"
 msgstr "關閉動畫"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5233
 msgid "Enable Animation"
 msgstr "開啟動畫"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5240
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5246
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5727 src/gtkconv.c:5730
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
@@ -2868,7 +2843,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - 開啟..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
@@ -2877,51 +2852,56 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:529
+# XXX
+#: src/gtkimhtml.c:535
+msgid "_Copy E-Mail Address"
+msgstr "複製電郵地址(_C)"
+
+#: src/gtkimhtml.c:547
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:557
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1639
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式，暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1647
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤：%s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1656
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1679
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自：</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題：</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2932,7 +2912,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2943,6 +2923,25 @@
 "\n"
 "%s"
 
+#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+msgid "Unable to open URL"
+msgstr "無法開啟網頁"
+
+#: src/gtknotify.c:413
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
+
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "瀏覽器「%s」是無效的。"
+
+#: src/gtknotify.c:437
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "執行「指令」時發生了錯誤：%s"
+
 #: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "選擇檔案"
@@ -2974,7 +2973,7 @@
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:457 src/main.c:331
+#: src/gtkpounce.c:457 src/main.c:342
 msgid "Sign on"
 msgstr "登入"
 
@@ -2986,8 +2985,8 @@
 msgid "Return from away"
 msgstr "由離開返回"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2030
 msgid "Idle"
 msgstr "閒置"
 
@@ -3032,7 +3031,7 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2085
+#: src/gtkpounce.c:518 src/gtkprefs.c:2087
 msgid "Test"
 msgstr "測試"
 
@@ -3084,15 +3083,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題！"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時，以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3100,155 +3099,154 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "風格"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "粗體(_B)"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "斜體(_I)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "底線(_U)"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "刪除的文字(_S)"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "字體"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "使用者自定字體(_M)"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "使用者自定字體大小(_Z)"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "顏色"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "文字顏色(_T)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "背景顏色(_K)"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "顯示表情(_S)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "顯示 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "按下 Ctrl-{B/I/U} 插入 HTML 標籤(_H)"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 CTRL-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "自動排序方式："
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "好友清單工具列"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B)："
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
 msgid "_Raise window on events"
 msgstr "當事件發生時，將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "群組顯示"
 
-#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
 #: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "顯示群組裡的好友/聊天室數目(_N)"
@@ -3257,7 +3255,7 @@
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:854 src/gtkprefs.c:998
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
@@ -3273,187 +3271,186 @@
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "位置(_P)："
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:905
 msgid "Send _URLs as Links"
 msgstr "送出 URL 為超連結(_U)"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:908
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:910
 msgid "_Tab Placement:"
 msgstr "標籤位置(_T)："
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:912
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:913
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:914
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:915
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:924
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:934
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:945
 msgid "Show status _icons on tabs"
 msgstr "在標籤上顯示好友狀態(_I)"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Window"
 msgstr "視窗"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "New window _width:"
 msgstr "新視窗寬度(_W)："
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:985 src/gtkprefs.c:1041
 msgid "New window _height:"
 msgstr "新視窗高度(_H)："
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:988 src/gtkprefs.c:1044
 msgid "_Entry field height:"
 msgstr "輸入欄高度(_E)："
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:993
 msgid "Hide window on _send"
 msgstr "送出訊息後關閉視窗(_S)"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:997
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1000
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1004
 msgid "Show _logins in window"
 msgstr "在視窗中顯示登入訊息(_L)"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1006
 msgid "Show a_liases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_L)"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1009
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1010
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1050
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1051
 msgid "_Tab-complete nicks"
 msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1053
 msgid "_Old-style tab completion"
 msgstr "舊式 Tab Completion (_O)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1057
 msgid "_Show people joining in window"
 msgstr "在視窗中顯示其他人進入的事件(_S)"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1059
 msgid "_Show people leaving in window"
 msgstr "在視窗中顯示其他人離開的事件(_S)"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1061
 msgid "Co_lorize screennames"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1105
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前，不用「毋須」，改為「不使用」
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1108
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1115
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1136
 msgid "_Host"
 msgstr "主機位址(_H)"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4530 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1171
 msgid "_User"
 msgstr "使用者(_U)"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1188
 msgid "Pa_ssword"
 msgstr "密碼(_S)"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1225
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1226
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1227
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1228
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1229
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1238
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1279
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1283
 msgid "_Browser:"
 msgstr "瀏覽器(_B)："
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1293
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3462,87 +3459,87 @@
 "使用者自定(_M)：\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1314
 msgid "Browser Options"
 msgstr "瀏覽器選項"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1315
 msgid "Open new _window by default"
 msgstr "預設為彈出一個新的視窗(_W)"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1330
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1331
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1333
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1335
 msgid "Strip _HTML from logs"
 msgstr "將交談記錄中的 HTML 標籤去除(_H)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1338
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1339
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入／登出(_S)"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1341
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置／取消閒置(_I)"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1343
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開／回來(_B)"
 
-#: src/gtkprefs.c:1340
+#: src/gtkprefs.c:1345
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入／閒置／離開等狀態(_O)"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1347
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "使用個別的檔案來記錄不同好友的登入(_N)"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1390
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1391
 msgid "_No sounds when you log in"
 msgstr "登入期間不啟動音效(_N)"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1393
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1397
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1398
 msgid "_Method:"
 msgstr "播放方式(_M)："
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1400
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1402
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1409
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1419
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3551,67 +3548,67 @@
 "音效指令(_C)：\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1474
 msgid "_Sending messages removes away status"
 msgstr "送出訊息時取消離開狀態(_S)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1476
 msgid "_Queue new messages when away"
 msgstr "在離開時，將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1479
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1482
 msgid "Seconds before _resending:"
 msgstr "送出回覆前的等待秒數(_R)："
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1485
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1487
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
-msgstr "目前進行的交談也要送出自動回應"
-
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1489
+msgid "Send auto-response in _active conversations"
+msgstr "目前進行的交談也要送出自動回應(_A)"
+
+#: src/gtkprefs.c:1499
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T)："
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1502
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1505
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1507
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1515
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1516
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr "閒置多久設為離開(_M)："
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1525
 msgid "Away m_essage:"
 msgstr "離開訊息(_M)："
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1587
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3626,7 +3623,7 @@
 "<span weight=\"bold\">網站：</span>\t\t%s\n"
 "<span weight=\"bold\">檔名：</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1592
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3641,98 +3638,98 @@
 "<span weight=\"bold\">網站：</span>  %s\n"
 "<span weight=\"bold\">檔名：</span>  %s"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1773
 msgid "Load"
 msgstr "載入"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: src/gtkprefs.c:1778 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "名稱"
 
-#: src/gtkprefs.c:1825
+#: src/gtkprefs.c:1827
 msgid "Details"
 msgstr "詳細資料"
 
-#: src/gtkprefs.c:1952
+#: src/gtkprefs.c:1954
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2059
+#: src/gtkprefs.c:2061
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2066
+#: src/gtkprefs.c:2068
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2093
+#: src/gtkprefs.c:2095
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2227
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2277
-msgid "Logging"
-msgstr "日誌"
-
-#: src/gtkprefs.c:2278
-msgid "Sounds"
-msgstr "音效"
-
 #: src/gtkprefs.c:2279
+msgid "Logging"
+msgstr "日誌"
+
+#: src/gtkprefs.c:2280
+msgid "Sounds"
+msgstr "音效"
+
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2284
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -3820,15 +3817,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:204
 msgid "Apply"
 msgstr "套用"
 
@@ -3890,58 +3887,14 @@
 "launched: %s"
 msgstr "無法播放音效，因為無法執行所設定的音效指令：%s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "無法儲存圖示檔案磁碟上。"
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 儲存圖示"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"使用方式: %s [選項]...\n"
-"\n"
-"  -a, --acct          顯示帳號清單\n"
-"  -w, --away[=MESG]   登入後顯示為離開 (選擇性參數 MESG 用來指定所要\n"
-"                      使用的離開訊息名稱)\n"
-"  -l, --login[=NAME]  自動登入 (選擇性參數 NAME 用來指定所要登入的帳\n"
-"                      號，同時以逗號作為分隔)\n"
-"  -n, --loginwin      不自動登入；顯示登入視窗\n"
-"  -u, --user=NAME     使用帳號 NAME\n"
-"  -f, --file=FILE     使用 FILE 為設定檔\n"
-"  -d, --debug         將除錯訊息輸出到標準輸出上\n"
-"  -v, --version       顯示版本訊息並離開\n"
-"  -h, --help          顯示這個說明訊息並離開\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: 連線開啟錯誤。\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "在指定好友交談時發生錯誤。"
@@ -4060,34 +4013,70 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) 報告 %s 由閒置返回 @ %s"
 
-#: src/main.c:140
+#: src/main.c:151
 msgid "Please enter your login."
 msgstr "請您登入。"
 
-#: src/main.c:223
+#: src/main.c:234
 msgid "<New User>"
 msgstr "<新使用者>"
 
-#: src/main.c:265
+#: src/main.c:276
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:281
-msgid "Screen Name:"
-msgstr "帳號："
-
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:553
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"使用方式: %s [選項]...\n"
+"\n"
+"  -a, --acct          顯示帳號清單\n"
+"  -w, --away[=MESG]   登入後顯示為離開 (選擇性參數 MESG 用來指定所要\n"
+"                      使用的離開訊息名稱)\n"
+"  -l, --login[=NAME]  自動登入 (選擇性參數 NAME 用來指定所要登入的帳\n"
+"                      號，同時以逗號作為分隔)\n"
+"  -n, --loginwin      不自動登入；顯示登入視窗\n"
+"  -u, --user=NAME     使用帳號 NAME\n"
+"  -f, --file=FILE     使用 FILE 為設定檔\n"
+"  -d, --debug         將除錯訊息輸出到標準輸出上\n"
+"  -v, --version       顯示版本訊息並離開\n"
+"  -h, --help          顯示這個說明訊息並離開\n"
+
+#. short message
+#: src/main.c:568
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 無法讀入您所提供的模組。"
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
@@ -4096,204 +4085,227 @@
 msgid "Slightly less boring default"
 msgstr "較為沒那麼無聊的預設"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: 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:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2306
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Available"
 msgstr "上線"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "只有好友可以看到我上線"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "離開（只有好友可以看到我）"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3536
-#: src/protocols/jabber/jabber.c:3599 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2326 src/protocols/yahoo/yahoo.c:2417
 msgid "Invisible"
 msgstr "隱身"
 
 # XXX
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "隱身（只有好友可以看到我）"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "離線"
 
+#: src/protocols/gg/gg.c:136
+msgid "Unable to resolve hostname."
+msgstr "無法解析主機名稱。"
+
 #: src/protocols/gg/gg.c:139
-msgid "Unable to resolve hostname."
-msgstr "無法解析主機名稱。"
+msgid "Unable to connect to server."
+msgstr "無法連線到伺服器。"
 
 #: src/protocols/gg/gg.c:142
-msgid "Unable to connect to server."
-msgstr "無法連線到伺服器。"
-
-#: src/protocols/gg/gg.c:145
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "讀取 Socket 時發生錯誤。"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "寫入 Socket 時發生錯誤。"
 
+#: src/protocols/gg/gg.c:151
+msgid "Authentication failed."
+msgstr "認證失敗。"
+
 #: src/protocols/gg/gg.c:154
-msgid "Authentication failed."
-msgstr "認證失敗。"
-
-#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "狀態：%s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "無法連結。"
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "讀取資料中"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "讀取資料中"
+msgid "Balancer handshake"
+msgstr "和負載平衡器交談中"
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "和負載平衡器交談中"
+msgid "Reading server key"
+msgstr "讀取 Server Key 中"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "讀取 Server Key 中"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:517
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:520
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
 msgid "UIN"
 msgstr "帳號"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
+#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+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:3894
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "性別"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
+#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "城市"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2583
+#: src/protocols/yahoo/yahoo.c:2605 src/protocols/yahoo/yahoo.c:2625
+#: src/protocols/yahoo/yahoo.c:2812 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "好友資訊"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4301,34 +4313,34 @@
 "因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題，所以 Gaim 沒有辦法完成您所指定的"
 "工作。請待會兒重試。"
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "無法存取目錄"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4336,11 +4348,11 @@
 "因為 Gaim 沒有辦法連上名錄伺服器，所以無法搜尋名錄上的資料。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法修改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4348,27 +4360,32 @@
 "因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器，所以無法修改您的密碼。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
+#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "修改密碼"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "無法讀取使用者簡介檔。"
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4386,7 +4403,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4399,17 +4416,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1808
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1809
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4461,21 +4478,47 @@
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-#: src/protocols/irc/irc.c:121
+# XXX 暫譯
+#: src/protocols/irc/irc.c:64
+msgid "Error displaying MOTD"
+msgstr "顯示是日訊息時發生了錯誤"
+
+# XXX 暫譯
+#: src/protocols/irc/irc.c:64
+msgid "No MOTD available"
+msgstr "沒有是日訊息"
+
+# XXX 暫譯
+#: src/protocols/irc/irc.c:65
+msgid "There is no MOTD associated with this connection."
+msgstr "這個連結沒有相關的是日訊息。"
+
+# XXX 暫譯
+#: src/protocols/irc/irc.c:68
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s 的是日訊息"
+
+# XXX 暫譯
+#: src/protocols/irc/irc.c:137
+msgid "View MOTD"
+msgstr "顯示是日訊息 (MOTD)"
+
+#: src/protocols/irc/irc.c:156
 msgid "Channel:"
 msgstr "頻道："
 
-#: src/protocols/irc/irc.c:145
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "登入：%s"
 
-#: src/protocols/irc/irc.c:173
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
@@ -4488,171 +4531,176 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:495
+#: src/protocols/irc/irc.c:530
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:496
+#: src/protocols/irc/irc.c:531
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4516 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:519
+#: src/protocols/irc/irc.c:554
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "被禁止"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
 msgid "Username"
 msgstr "使用者"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2683
 msgid "Realname"
 msgstr "姓名"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>閒置了：</b>%s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "上線自"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>描述：</b>光宗耀祖<br>"
 
+# XXX 還是譯成「好友 %s 的資訊」比較通順？
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "%s 的好友資訊"
+
 # NOTE 新版的IRC prpl起動時不顯示這個；直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為：%s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為：%s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s："
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -4680,281 +4728,498 @@
 msgid "Disconnected"
 msgstr "已停止連線"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "寫入錯誤"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "無法更改密碼。"
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3583
-msgid "Chatty"
-msgstr "想聊天"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3591
-msgid "Extended Away"
-msgstr "長時間離開"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3535
-#: src/protocols/jabber/jabber.c:3595 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "請勿打擾"
-
-#: src/protocols/jabber/jabber.c:1514
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber 錯誤 %s"
-
-#: src/protocols/jabber/jabber.c:1620
-#, c-format
-msgid "Error %s: %s"
-msgstr "錯誤 %s：%s"
-
-#: src/protocols/jabber/jabber.c:1623
-msgid "Unknown Error in presence"
-msgstr "在確定好友的連線狀態時，發生了未知的錯誤"
-
-#: src/protocols/jabber/jabber.c:1801
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
-
-#: src/protocols/jabber/jabber.c:1829
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "Jabber 使用者 %s 並不存在，所以將不會加入到您的名單中。"
-
-#: src/protocols/jabber/jabber.c:1832
-msgid "No such user."
-msgstr "沒有這個使用者。"
-
-#: src/protocols/jabber/jabber.c:1996
-msgid "Authenticating"
-msgstr "認證中"
-
-#: src/protocols/jabber/jabber.c:2030
-msgid "Unknown login error"
-msgstr "未知的登入錯誤"
-
-#: src/protocols/jabber/jabber.c:2380
-msgid "Password successfully changed."
-msgstr "密碼修改成功。"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:4334
-msgid "Connection lost"
-msgstr "失去連線"
-
-#: src/protocols/jabber/jabber.c:2427 src/protocols/jabber/jabber.c:2461
-#: src/protocols/jabber/jabber.c:4336 src/protocols/jabber/jabber.c:4385
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "無法連線"
-
-#: src/protocols/jabber/jabber.c:2432
-msgid "Connected"
-msgstr "連線成功"
-
-#: src/protocols/jabber/jabber.c:2435
-msgid "Requesting Authentication Method"
-msgstr "要求認證的方式中"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2455 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "連線中"
-
-#: src/protocols/jabber/jabber.c:2781
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "使用者 %s 是一個無效的 Jabber 帳號，所以不會被加入到名單中。"
-
-#: src/protocols/jabber/jabber.c:2783
-msgid "Unable to add buddy."
-msgstr "無法加入好友。"
-
-#: src/protocols/jabber/jabber.c:2784
-msgid "Jabber Error"
-msgstr "Jabber 錯誤"
-
-#: src/protocols/jabber/jabber.c:3043 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "聊天室："
-
-#: src/protocols/jabber/jabber.c:3048
-msgid "Server:"
-msgstr "伺服器："
-
-#: src/protocols/jabber/jabber.c:3054
-msgid "Handle:"
-msgstr "暱稱："
-
-#: src/protocols/jabber/jabber.c:3084
-msgid "Unable to join chat"
-msgstr "無法加入聊天室"
-
-#: src/protocols/jabber/jabber.c:3320 src/protocols/jabber/jabber.c:3371
-#: src/protocols/jabber/jabber.c:3793
-msgid "Jabber ID"
-msgstr "Jabber 帳號"
-
-#: src/protocols/jabber/jabber.c:3321
-msgid "Error"
-msgstr "錯誤"
-
-#: src/protocols/jabber/jabber.c:3372 src/protocols/jabber/jabber.c:3431
-#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3819
-msgid "Status"
-msgstr "狀態"
-
-#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3464
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:50
+msgid "Server requires SSL for login"
+msgstr "登入這個伺服器需要使用 SSL"
+
+#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
+#: src/protocols/jabber/auth.c:354
+msgid "Invalid response from server"
+msgstr "無效的伺服器回應"
+
+#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+msgid "Server does not use any supported authentication method"
+msgstr "伺服器並不提供任何一種被支援的認證方式"
+
+# XXX 好像有些怪，譯文有待改進
+#: src/protocols/jabber/auth.c:327
+msgid "Invalid challenge from server"
+msgstr "伺服器送來了無效的挑戰"
+
+#: src/protocols/jabber/auth.c:357
+msgid "Bad Protocol"
+msgstr "無效的協定"
+
+#: src/protocols/jabber/auth.c:360
+msgid "Encryption Required"
+msgstr "必須加密"
+
+#: src/protocols/jabber/auth.c:363
+msgid "Invalid authzid"
+msgstr "無效的 authzid"
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/auth.c:366
+msgid "Invalid Mechanism"
+msgstr "機制無效"
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/auth.c:368
+msgid "Invalid Realm"
+msgstr "領域無效"
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/auth.c:371
+msgid "Mechanism Too Weak"
+msgstr "機制太弱"
+
+#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
+#: src/protocols/oscar/oscar.c:5472
 msgid "Not Authorized"
 msgstr "未認證"
 
-#: src/protocols/jabber/jabber.c:3481
-msgid "View Error Msg"
-msgstr "觀看錯誤訊息"
-
-#: src/protocols/jabber/jabber.c:3500
-msgid "Un-hide From"
-msgstr "現身給"
-
-#: src/protocols/jabber/jabber.c:3503
-msgid "Temporarily Hide From"
-msgstr "暫時隱身於"
-
-#: src/protocols/jabber/jabber.c:3510
-msgid "Cancel Presence Notification"
-msgstr "取消出現通知"
-
-#: src/protocols/jabber/jabber.c:3518
-msgid "Re-request authorization"
-msgstr "重新要求認證"
-
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/auth.c:377
+msgid "Temporary Authentication Failure"
+msgstr "認證暫時失敗"
+
+#: src/protocols/jabber/auth.c:379
+msgid "Authentication Failure"
+msgstr "認證失敗"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3722
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3723
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3724 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
+#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2677
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
 msgid "Locality"
 msgstr "市╱村"
 
-#: src/protocols/jabber/jabber.c:3729
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
 msgid "Region"
 msgstr "省╱州"
 
-#: src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/jabber.c:584
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: src/protocols/jabber/jabber.c:3732
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "國家"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
+#: src/protocols/jabber/buddy.c:694
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2671
+msgid "Email"
+msgstr "電子郵件"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/jabber.c:3736
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/jabber.c:3738 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
+#: src/protocols/oscar/oscar.c:3926
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:4196 src/protocols/jabber/jabber.c:4197
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4198
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/jabber.c:4271
-msgid "Server Registration successful!"
-msgstr "伺服器註冊成功！"
-
-#: src/protocols/jabber/jabber.c:4287
-#, c-format
-msgid "Error %d: %s"
-msgstr "錯誤 %d：%s"
-
-#: src/protocols/jabber/jabber.c:4292
-msgid "Unknown registration error"
-msgstr "未知的註冊錯誤"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "Jabber 帳號"
+
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
+#: src/protocols/jabber/jabber.c:856
+msgid "Status"
+msgstr "狀態"
+
+# XXX
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+msgid "Resource"
+msgstr "資源"
+
+# TODO: Untranslated
+# NOTE: 芬蘭文譯「其他名」，但中文這樣譯仍然是太怪了
+#: src/protocols/jabber/buddy.c:624
+msgid "Middle Name"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
+#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+msgid "Address"
+msgstr "地址"
+
+#: src/protocols/jabber/buddy.c:651
+msgid "P.O. Box"
+msgstr "郵政信箱"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Photo"
+msgstr "照片"
+
+# TODO Untranslated <- 我的中文程度真的很差
+#: src/protocols/jabber/buddy.c:757
+msgid "Logo"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:771
+msgid "Jabber Profile"
+msgstr "Jabber 個人資料"
+
+#: src/protocols/jabber/buddy.c:866
+msgid "Un-hide From"
+msgstr "現身給"
+
+#: src/protocols/jabber/buddy.c:869
+msgid "Temporarily Hide From"
+msgstr "暫時隱身於"
+
+#: src/protocols/jabber/buddy.c:877
+msgid "Cancel Presence Notification"
+msgstr "取消出現通知"
+
+#: src/protocols/jabber/buddy.c:885
+msgid "Re-request authorization"
+msgstr "重新要求認證"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
+msgid "Room:"
+msgstr "聊天室："
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "伺服器："
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "暱稱："
+
+# XXX 譯文有待改進
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "對工作階段進行初始化時發生了錯誤"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "無效的格式"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "無效的 Namespace Prefix"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "連線已逾時"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "伺服器消失了"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "不明的伺服器"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "錯誤的定址"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "伺服器內部錯誤"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "帳號無效"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:124
+#, fuzzy
+msgid "Invalid Namespace"
+msgstr "命名空間無效"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "無效的 XML"
+
+# TODO Untranslated 因為不知原文說什麼
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr ""
+
+# XXX 務必要覆查譯文
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "遠端連線失敗"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr ""
+
+# TODO Untranslated 因為不知原文說什麼
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr ""
+
+# XXX 要覆查譯文
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "系統要關機"
+
+# TODO Untranslated 因為不知道原文說什麼
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr ""
+
+# TODO Untranslated 因為不知道原文說什麼
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr ""
+
+# TODO 因為不知道原文說什麼
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "不支援的版本"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "寫入錯誤"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
+#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
+msgid "Read Error"
+msgstr "讀取錯誤"
+
+#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "無法建立 Socket"
+
+#: src/protocols/jabber/jabber.c:419
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "成功註冊 %s@%s"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
+msgid "Registration Successful"
+msgstr "註冊成功"
+
+#: src/protocols/jabber/jabber.c:431
+msgid "Unknown Error"
+msgstr "未知錯誤"
+
+#: src/protocols/jabber/jabber.c:434
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "%s@%s 註冊失敗：%s"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+msgid "Registration Failed"
+msgstr "註冊失敗"
+
+#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
+msgid "Already Registered"
+msgstr "已經註冊"
+
+#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
+msgid "Password"
+msgstr "密碼"
+
+#: src/protocols/jabber/jabber.c:549
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "名"
+
+#. State
+#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "省╱州"
+
+#: src/protocols/jabber/jabber.c:589
+msgid "Phone"
+msgstr "電話"
+
+#: src/protocols/jabber/jabber.c:607
+msgid "Please fill out the information below to register your new account."
+msgstr "為您的新帳戶註冊，請填寫下列資料："
+
+#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
+msgid "Register New Jabber Account"
+msgstr "註冊新的 Jabber 帳戶"
+
+#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1925
+msgid "Connecting"
+msgstr "連線中"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:714
+msgid "Initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:720
+msgid "Authenticating"
+msgstr "認證中"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:728
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
+#: src/protocols/jabber/presence.c:257
+msgid "Error"
+msgstr "錯誤"
+
+#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "想聊天"
+
+#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "長時間離開"
+
+#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+msgid "Do Not Disturb"
+msgstr "請勿打擾"
+
+#: src/protocols/jabber/jabber.c:884
+msgid "Password Changed"
+msgstr "密碼修改成功"
+
+#: src/protocols/jabber/jabber.c:885
+msgid "Your password has been changed."
+msgstr "成功修改了您的密碼。"
+
+#: src/protocols/jabber/jabber.c:895
+#, c-format
+msgid "Error changing password: %s"
+msgstr "修改密碼期間出現了錯誤：%s"
+
+#: src/protocols/jabber/jabber.c:899
+msgid "Unknown error occurred changing password"
+msgstr "修改密碼期間出現了不明的錯誤"
+
+#: src/protocols/jabber/jabber.c:956
+msgid "Password (again)"
+msgstr "舊密碼（再次確認）"
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
+msgid "Change Jabber Password"
+msgstr "修改 Jabber 密碼"
+
+#: src/protocols/jabber/jabber.c:962
+msgid "Please enter your new password"
+msgstr "請輸入您的新密碼"
 
 #. *< api_version
 #. *< type
@@ -4966,37 +5231,74 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4495 src/protocols/jabber/jabber.c:4497
+#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
-# XXX
-#: src/protocols/jabber/jabber.c:4519
-msgid "Resource"
-msgstr "資源"
-
-#: src/protocols/jabber/jabber.c:4525
-msgid "Use SSL"
-msgstr "使用 SSL"
-
-#: src/protocols/jabber/jabber.c:4534
+#: src/protocols/jabber/jabber.c:1083
+msgid "Force Old SSL"
+msgstr "強迫使用舊式 SSL"
+
+#: src/protocols/jabber/jabber.c:1091
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:95
+#, c-format
+msgid "Message from %s"
+msgstr "由 %s 發出的訊息"
+
+# TODO Untranslated
+#: src/protocols/jabber/message.c:178
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "無法傳送訊息到 %s：%s"
+
+#: src/protocols/jabber/message.c:181
+msgid "Jabber Message Error"
+msgstr "Jabber 訊息錯誤"
+
+#: src/protocols/jabber/message.c:244
+#, c-format
+msgid " (Code %s)"
+msgstr " (代碼 %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "XML 分析錯誤"
+
+#: src/protocols/jabber/presence.c:167
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (代碼 %s)"
+
+#: src/protocols/jabber/presence.c:172
+msgid "Unknown Error in presence"
+msgstr "在確定好友的連線狀態時，發生了未知的錯誤"
+
+#: src/protocols/jabber/presence.c:176
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
+
+#: src/protocols/jabber/presence.c:253
+msgid "Unable to join chat"
+msgstr "無法加入聊天室"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "無法取得 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "無法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "無法送出 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "送出密碼中"
 
@@ -5004,15 +5306,15 @@
 msgid "Protocol version not supported"
 msgstr "不支援這個版本的通訊協定"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "無法取得 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "無法取得 INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "取得無效的 XFR"
 
@@ -5024,16 +5326,23 @@
 msgid "Unable to parse message."
 msgstr "無法解析訊息。"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1748 src/protocols/yahoo/yahoo.c:1813
+msgid "Unable to connect"
+msgstr "無法連線"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
@@ -5055,9 +5364,8 @@
 msgid "Fully Qualified Domain Name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
-# XXX 原文有文法上的錯誤
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "已經登入"
 
 #: src/protocols/msn/error.c:50
@@ -5132,14 +5440,15 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "尚未登入"
 
 # XXX 參閱上列網站 (www.hypothetic.org) 第500號錯誤
+# NOTE 譯文更動 by Ambrose
 #: src/protocols/msn/error.c:111
 msgid "Internal server error"
-msgstr "內部伺服器錯誤"
+msgstr "伺服器內部錯誤"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
@@ -5186,8 +5495,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "無法寫入"
 
@@ -5220,8 +5529,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -5246,38 +5555,38 @@
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo；使用者可以輸入任何的新暱稱，
 # NOTE 即使和使用者的帳號毫無關係，似乎也是有效的
 # XXX 這看來是一個鈙述句，事實上是對使用者發出的請求╱問題
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼？"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5285,95 +5594,95 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話，或是其他的行動"
 "裝置上呢？"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2144
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態：</b>%s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2408
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2012
+#: src/protocols/yahoo/yahoo.c:2310 src/protocols/yahoo/yahoo.c:2409
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2413
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2024
+#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2415
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
 # NOTE: 原譯文有誤
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5382,11 +5691,11 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "無效的 MSN 使用者帳號"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5395,67 +5704,77 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的拒絕清單。"
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2584
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3931
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2695
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3917
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2701
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2689
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2713
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2757
 msgid "Favorite Quote"
 msgstr "至愛名言"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2801
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "網頁"
 
+# NOTE 譯文更動 by Ambrose
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2819
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "無法取得使用者 %s 的個人資訊"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2821
+msgid "The user's profile is empty."
+msgstr "這個使用者的資訊是空白的。"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5466,82 +5785,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤：%s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "無法寫入到 MSN 的 Nexus 伺服器。"
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "無法由 MSN 的 Nexus 伺服器讀取。"
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus 伺服器傳回無效的重新導向資訊。"
 
-#: src/protocols/msn/notification.c:437
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "嘗試經由 MSN 的登入伺服器進行認證期間，發生了不明的錯誤。"
 
-#: src/protocols/msn/notification.c:549
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN 的 Nexus 伺服器傳回了無效的資訊。"
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "無法連線到 Passport 伺服器。"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "無法送出密碼"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "不支援這個通訊協定"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線，因為您由其他的地方登入。"
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已中斷連線，MSN 伺服器將暫時關閉。"
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s（%s）想要將 %s 加入他（她）的好友清單。"
 
-#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "使用者 %s（%s）想要將您加入他（她）的好友清單"
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "無法傳送至通知伺服器"
 
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5576,50 +5895,50 @@
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
-#: src/protocols/napster/napster.c:246
+#: src/protocols/napster/napster.c:242
 #, c-format
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "無法由伺服器讀取資訊。指令為 %hd，長度為 %hd。"
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者：%s，檔案：%s，大小：%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您被中斷連線，因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "加入哪個群組："
 
@@ -5633,182 +5952,182 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:178
 msgid "Rate to client"
 msgstr "到客戶端速率"
 
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "伺服器不存在"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "沒有指定服務"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "過時的 SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+#: src/protocols/oscar/oscar.c:184
+msgid "Not supported by client"
+msgstr "客戶端不支援"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "被客戶端拒絕"
+
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "伺服器不存在"
+msgid "Reply too big"
+msgstr "回覆太大了"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "沒有指定服務"
+msgid "Responses lost"
+msgstr "遺失回應"
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "客戶端不支援"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "被客戶端拒絕"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "回覆太大了"
-
-#: src/protocols/oscar/oscar.c:193
-msgid "Responses lost"
-msgstr "遺失回應"
-
-#: src/protocols/oscar/oscar.c:194
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」，新譯「本機」)
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "本地端的允許╱拒絕清單"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "太邪惡了（寄件人）"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "太邪惡了（收件人）"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5816,17 +6135,17 @@
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5835,29 +6154,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入授權碼。"
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "（收取這個訊息時發生錯誤）"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 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 "
@@ -5866,46 +6185,45 @@
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, 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:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5914,32 +6232,32 @@
 "使用者 %u 因為下列原因，想要將您加入他（她）的好友清單中：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
+
 #: src/protocols/oscar/oscar.c:2635
 #, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
-
-#: src/protocols/oscar/oscar.c:2643
-#, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
@@ -5951,7 +6269,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5964,7 +6282,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5982,34 +6300,35 @@
 # NOTE 譯文更動 by Paladin
 # ANS 這是舊字串，和新的Meta-Contact功能沒有關係
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
+# NOTE 已經通知 Gaim Team 更改了舊字串
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, 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:2781
+#: src/protocols/oscar/oscar.c:2773
 #, 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:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6017,112 +6336,102 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度太快。"
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, 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:2808
+#: src/protocols/oscar/oscar.c:2800
 #, 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:2817
+#: src/protocols/oscar/oscar.c:2809
 #, 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:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
+#: src/protocols/oscar/oscar.c:6068
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:6066
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:6067
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, 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:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>狀態：</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤：%s\n"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出："
 
-#: src/protocols/oscar/oscar.c:3052
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "使用者 %s 的個人資訊並不存在："
-
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3070
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
-msgid "Direct IM"
-msgstr "即時訊息"
-
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3073
+msgid "AIM Direct IM"
+msgstr "AIM 式即時訊息"
+
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3086
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3089
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3092
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3114
-msgid "EveryBuddy Bug"
-msgstr "EveryBuddy 錯誤"
-
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3095
+msgid "ICQ Direct Connect"
+msgstr "ICQ 式直接連線"
+
+#: src/protocols/oscar/oscar.c:3098
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3101
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6133,94 +6442,73 @@
 # 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:3123
+#: src/protocols/oscar/oscar.c:3104
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3107
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3110
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3113
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3116
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3119
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3122
 msgid "Secure IM"
 msgstr "加密即時訊息"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr "<I>因為使用了未知的編碼，所以無法顯示訊息。</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "使用者名稱：<b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3152
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "警告等級：<b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
 msgstr "上線時間：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3159
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
 msgstr "成為成員的時間：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
+#: src/protocols/oscar/oscar.c:3164
+#, c-format
+msgid "Idle: <b>%s</b>"
 msgstr "閒置：<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3167
 msgid "Idle: <b>Active</b>"
 msgstr "閒置：<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"使用者名稱：<B>%s</B>  %s <BR>\n"
-"警告等級：<B>%d %%</B><BR>\n"
-"%s%s%s<BR>\n"
-"<HR>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>使用者沒有離開訊息</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "客戶端相容性："
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>未提供任何信息</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3594
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3595
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6228,133 +6516,134 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3656
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線，因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3658
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3914
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3934
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3937
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3941
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "地址"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3957
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3973
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3975
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3978
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3981
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:3990
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
+# XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
+#: src/protocols/oscar/oscar.c:4040
+msgid "Pop-Up Message"
+msgstr "彈出訊息"
+
 # XXX 可能譯錯
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列帳號與 %s 有關"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4065
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4105
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4133
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4136
 #, 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:4205
+#: src/protocols/oscar/oscar.c:4139
 #, 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:4208
+#: src/protocols/oscar/oscar.c:4142
 #, 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:4211
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6362,7 +6651,7 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6370,19 +6659,19 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4151
 #, 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:4220
+#: src/protocols/oscar/oscar.c:4154
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4164
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6391,20 +6680,20 @@
 "您的帳號目前被格式化如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4170
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4400
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4401
 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 "
@@ -6413,7 +6702,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4431
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6423,15 +6712,15 @@
 "truncated it for you."
 msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4436
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4455
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4456
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6440,7 +6729,7 @@
 "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4496
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6450,15 +6739,15 @@
 "truncated it for you."
 msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4501
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4721
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4722
 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 "
@@ -6467,12 +6756,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失，可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
+#: src/protocols/oscar/oscar.c:4819
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6481,15 +6770,15 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4998
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6499,7 +6788,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6509,11 +6798,11 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5039
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6523,112 +6812,129 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5114
+#, 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:5187
+#: src/protocols/oscar/oscar.c:5115
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5119
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "聊天室號碼："
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5379
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5388
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間：</b>"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5400
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 位址：</b>"
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性：</b>"
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>上線：</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5431
+msgid "<b>Away Message:</b> "
+msgstr "<b>離開訊息：</b>"
+
+#: src/protocols/oscar/oscar.c:5440
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態：</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2032
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5921
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5934
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5937
 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:5930
+#: src/protocols/oscar/oscar.c:6112
+msgid "Buddy Comment:"
+msgstr "好友說明："
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Edit Buddy Comment"
+msgstr "編輯好友說明"
+
+#: src/protocols/oscar/oscar.c:6136
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5974
+# NOTE 將「直接消息」改譯為「即時訊息」
+#: src/protocols/oscar/oscar.c:6151
+msgid "Direct IM"
+msgstr "即時訊息"
+
+#: src/protocols/oscar/oscar.c:6180
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6201
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6202
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6208
 msgid "New screenname formatting:"
 msgstr "新的帳號格式："
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6257
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6301
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6304
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6305
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6636,43 +6942,59 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6115
+#: src/protocols/oscar/oscar.c:6319
+msgid "Find Buddy by E-mail"
+msgstr "以電子郵件地址來找尋好友"
+
+#: src/protocols/oscar/oscar.c:6320
+msgid "Search for a buddy by e-mail address"
+msgstr "使用電子郵件地址搜尋好友"
+
+#: src/protocols/oscar/oscar.c:6321
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "請輸入對方的電子郵件地址。"
+
+#: src/protocols/oscar/oscar.c:6324
+msgid "Search"
+msgstr "搜尋"
+
+#: src/protocols/oscar/oscar.c:6337
 msgid "Available Message:"
 msgstr "上線訊息："
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "請和我聊聊吧！我覺得好寂寞！"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6415
 msgid "Set Available Message"
 msgstr "設定上線訊息"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6429
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6437
+msgid "Configure IM Forwarding (URL)"
+msgstr "設定即時訊息的轉送 (透過網頁)"
+
+#: src/protocols/oscar/oscar.c:6448
 msgid "Format Screenname"
 msgstr "格式化帳號"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6454
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6460
 msgid "Display Current Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6466
 msgid "Change Current Registered Address"
 msgstr "修改目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6475
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6483
 msgid "Search for Buddy by Email"
 msgstr "使用電子郵件地址搜尋好友"
 
@@ -6686,122 +7008,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6623
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6628
 msgid "Auth port"
 msgstr "認證通訊埠"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長，最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "警告：%s 是不被允許的。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄，因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息，因為它太大了。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息，因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "匹配太多。"
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "需輸入更多檢索條件。"
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "需輸入更多檢索條件。"
+msgid "Dir service temporarily unavailable."
+msgstr "目錄服務暫時不存在。"
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "目錄服務暫時不存在。"
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "這個國家不被支援。"
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "這個國家不被支援。"
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因：%s。"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "服務暫時不存在。"
 
+#: src/protocols/toc/toc.c:577
+msgid "Your warning level is currently too high to log in."
+msgstr "您目前登入系統的警告等級太高，以致無法登入。"
+
 #: src/protocols/toc/toc.c:580
-msgid "Your warning level is currently too high to log in."
-msgstr "您目前登入系統的警告等級太高，以致無法登入。"
-
-#: src/protocols/toc/toc.c:583
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6809,37 +7131,37 @@
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤：%s。"
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊：%s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -6848,43 +7170,43 @@
 "當這個發生時，TOC 會忽略所有送來的訊息，同時可能在您送出訊息時，將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態，請您見諒。"
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入！"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗；可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "無法開啟傳輸的連線！"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案：%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他（她）。"
@@ -6899,101 +7221,97 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "基本資料"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "個人資訊"
 
 # XXX 看了原始碼，但不肯定譯得對
 # NOTE SimGuy: probably "Other IM services" if you can do that one :)
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "其他即時傳訊帳號"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ 帳號"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "我來自"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "設定您的 Trepia 個人資料。"
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "個人資料"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "設定個人資料"
 
 # XXX 好像不太對
 # NOTE 譯文更動 by Paladin
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "參觀網頁"
 
 # NOTE Debian 譯「local」為「本地端」
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "本地端的使用者"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/，但在該站很難找東西
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "登入中"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "無法建立 Socket"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7004,20 +7322,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:702
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:754
+#: src/protocols/yahoo/yahoo.c:762
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7026,11 +7344,25 @@
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:755
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1383
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+"Yahoo 伺服器要求了使用一種不明的認證方式，因此這個版本的 Gaim 很可能不會成功"
+"登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
+
+#: src/protocols/yahoo/yahoo.c:1386
+msgid "Failed Yahoo! Authentication"
+msgstr "Yahoo! 認證失敗"
+
+#: src/protocols/yahoo/yahoo.c:1459
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7039,61 +7371,62 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1049
+#: src/protocols/yahoo/yahoo.c:1462
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1494
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1544
 #, 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:1134
+#: src/protocols/yahoo/yahoo.c:1546
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1648 src/protocols/yahoo/yahoo.c:1778
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1803 src/protocols/yahoo/yahoo.c:1912
+#: src/protocols/yahoo/yahoo.c:1936
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2411
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:2018 src/protocols/yahoo/yahoo.c:2316
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:2022 src/protocols/yahoo/yahoo.c:2320
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:2026 src/protocols/yahoo/yahoo.c:2324
+#: src/protocols/yahoo/yahoo.c:2416
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -7101,78 +7434,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:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:2090 src/protocols/yahoo/yahoo.c:2124
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:2180
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:2186
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2232
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2243
 msgid "Activate ID"
 msgstr "啟動 ID"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2601
 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:1989 src/protocols/yahoo/yahoo.c:2005
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2622
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結"
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結<br>"
+
+#: src/protocols/yahoo/yahoo.c:2621
 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:2037
+#: src/protocols/yahoo/yahoo.c:2666
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2726 src/protocols/yahoo/yahoo.c:2730
+#: src/protocols/yahoo/yahoo.c:2734
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2749
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2767
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2781
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2786
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
 # TODO 譯文有待改進
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Member Since"
 msgstr "自右列日期起為成員"
 
@@ -7186,92 +7519,92 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/yahoo/yahoo.c:2962
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2979
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2984
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoochat.c:191
+#: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他（她）到會議室「%s」的邀請，理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限？"
 
-#: src/protocols/yahoo/yahoochat.c:509
+#: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:510
+#: src/protocols/yahoo/yahoochat.c:532
 msgid "Maybe they're not in a chat?"
 msgstr "可能他（她）並不在聊天室內？"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者：</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名：</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr "因為 Zephyr 用您登入系統的帳號，您是不可能擁有多個 Zephyr 帳戶的。"
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 ZLocate 是一種名錄服務，不過在這裡不知是什麼意思
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr ""
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 Class 不是類別，而是一種半私人的聊天室
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr ""
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 Instance 是一種公共的聊天室
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "接受者："
 
@@ -7285,7 +7618,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -7300,38 +7633,15 @@
 msgstr ""
 "對於您目前所設定的代理伺服器型態來說，您所給定的伺服器名稱及通訊埠是無效的"
 
-#: src/prpl.c:143
-#, 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/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"您想將他（她）加入到您的好友名單中嗎？"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Gaim - 資訊"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "將使用者加入您的好友清單？"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "使用者自定"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "接受"
 
@@ -7339,27 +7649,27 @@
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "（%d 個訊息）"
 
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "（一個訊息）"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7368,11 +7678,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7381,23 +7691,15 @@
 "使用者「%s」邀請 %s 到好友聊天室：「%s」\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室：「%s」\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎？"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Gaim - 訊息"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "更多資訊"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7413,28 +7715,32 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "計算中..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "未知。"
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "計算中..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "未知。"
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: 連線開啟錯誤。\n"
 
 # TODO need to check context
 #: src/win32/win32dep.c:474
@@ -7446,6 +7752,142 @@
 msgid "Moving Gaim user settings directory to:"
 msgstr "包含 Gaim 的使用者設定的目錄現在移至："
 
+#~ msgid ""
+#~ "Communication with the browser failed. Please close all windows and try "
+#~ "again."
+#~ msgstr "和瀏覽器的溝通失敗。請關閉所有的視窗後重試。"
+
+#~ msgid "Alias"
+#~ msgstr "別名"
+
+#~ msgid "Group"
+#~ msgstr "群組"
+
+#~ msgid "Add To"
+#~ msgstr "增加到"
+
+#~ msgid "EveryBuddy Bug"
+#~ msgstr "EveryBuddy 錯誤"
+
+#~ msgid "<hr>%s"
+#~ msgstr "<hr>%s"
+
+#~ msgid "Set Directory Info"
+#~ msgstr "設定使用者資訊"
+
+#~ msgid "Directory Info"
+#~ msgstr "目錄資訊"
+
+#~ msgid "Setting Dir Info for %s:"
+#~ msgstr "設定 %s 的使用者資訊："
+
+#~ msgid "Allow Web Searches To Find Your Info"
+#~ msgstr "允許在 Web 搜尋來檢視您的個人資訊"
+
+# NOTE「小名」大概也可以，但「Maiden Name」通常係指未嫁時的「本姓」
+#~ msgid "Maiden Name"
+#~ msgstr "本姓"
+
+#~ msgid "Below are the results of your search: "
+#~ msgstr "以下是您所做查詢的結果："
+
+#~ msgid "Search for Buddy"
+#~ msgstr "找尋好友"
+
+#~ msgid "Find Buddy By Info"
+#~ msgstr "以資訊找尋好友"
+
+#~ msgid "Unable to change password."
+#~ msgstr "無法更改密碼。"
+
+#~ msgid ""
+#~ "The current password you entered is incorrect.  Your password has not "
+#~ "been changed."
+#~ msgstr "您所輸入的舊密碼是錯的。您的密碼沒有更改。"
+
+#~ msgid ""
+#~ "The new password you entered is the same as your current password.  Your "
+#~ "password remains the same."
+#~ msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
+
+#~ msgid "Jabber Error %s"
+#~ msgstr "Jabber 錯誤 %s"
+
+#~ msgid "Error %s: %s"
+#~ msgstr "錯誤 %s：%s"
+
+#~ msgid ""
+#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ "roster."
+#~ msgstr "Jabber 使用者 %s 並不存在，所以將不會加入到您的名單中。"
+
+#~ msgid "No such user."
+#~ msgstr "沒有這個使用者。"
+
+#~ msgid "Unknown login error"
+#~ msgstr "未知的登入錯誤"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "密碼修改成功。"
+
+#~ msgid "Connected"
+#~ msgstr "連線成功"
+
+#~ msgid "Requesting Authentication Method"
+#~ msgstr "要求認證的方式中"
+
+#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+#~ msgstr "使用者 %s 是一個無效的 Jabber 帳號，所以不會被加入到名單中。"
+
+#~ msgid "Unable to add buddy."
+#~ msgstr "無法加入好友。"
+
+#~ msgid "View Error Msg"
+#~ msgstr "觀看錯誤訊息"
+
+#~ msgid "Error %d: %s"
+#~ msgstr "錯誤 %d：%s"
+
+#~ msgid "Unknown registration error"
+#~ msgstr "未知的註冊錯誤"
+
+#~ msgid "<B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>狀態：</B> %s<HR>%s"
+
+#~ msgid ""
+#~ "<i>Unable to display information because it was sent in an unknown "
+#~ "encoding.</i>"
+#~ msgstr "<I>因為使用了未知的編碼，所以無法顯示訊息。</i>"
+
+#~ msgid ""
+#~ "Username : <b>%s</b>  %s <br>\n"
+#~ "Warning Level : <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+#~ msgstr ""
+#~ "使用者名稱：<B>%s</B>  %s <BR>\n"
+#~ "警告等級：<B>%d %%</B><BR>\n"
+#~ "%s%s%s<BR>\n"
+#~ "<HR>\n"
+
+#~ msgid "<i>User has no away message</i>"
+#~ msgstr "<i>使用者沒有離開訊息</i>"
+
+#~ msgid "Client Capabilities: "
+#~ msgstr "客戶端相容性："
+
+#~ msgid "<i>No Information Provided</i>"
+#~ msgstr "<i>未提供任何信息</i>"
+
+#~ msgid "Please talk to me, I'm lonely! (and single)"
+#~ msgstr "請和我聊聊吧！我覺得好寂寞！"
+
+#~ msgid "Gaim - Popup"
+#~ msgstr "Gaim - 訊息"
+
+#~ msgid "More Info"
+#~ msgstr "更多資訊"
+
 #~ msgid "_Quote window title"
 #~ msgstr "視窗標題前後加上引號(_Q)"
 
@@ -7484,18 +7926,12 @@
 #~ msgid "Sign On"
 #~ msgstr "登入"
 
-#~ msgid "Unable to change password"
-#~ msgstr "無法更改密碼"
-
 #~ msgid "Unable to send USR\n"
 #~ msgstr "無法送出 USR\n"
 
 #~ msgid "Got invalid XFR\n"
 #~ msgstr "取得無效的 XFR\n"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "認證失敗"
-
 #~ msgid ""
 #~ "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 #~ msgstr "GAIM::register 呼叫時並沒有提供適當的參數。請參考 PERL-HOWTO。"
@@ -7727,16 +8163,6 @@
 #~ msgid "_Login"
 #~ msgstr "登入(_L)"
 
-#~ msgid ""
-#~ "Please enter your password for %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "請輸入您在 %s 的密碼。\n"
-#~ "\n"
-
-#~ msgid "_Password"
-#~ msgstr "密碼(_P)"
-
 #~ msgid "TOC not found."
 #~ msgstr "找不到 TOC。"