# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1071506574 0
# Node ID 818835fb55cc1c9cd7af3d1eb131ef66092b5369
# Parent  ec9a1e76581ced1e443169a0df76cafc492ba3d5
[gaim-migrate @ 8544]
update

committer: Tailor Script <tailor@pidgin.im>

diff -r ec9a1e76581c -r 818835fb55cc po/zh_TW.po
--- a/po/zh_TW.po	Mon Dec 15 16:32:07 2003 +0000
+++ b/po/zh_TW.po	Mon Dec 15 16:42:54 2003 +0000
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.75\n"
-"POT-Creation-Date: 2003-12-07 20:02-0500\n"
+"POT-Creation-Date: 2003-12-14 23:04-0500\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -168,12 +168,12 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2531 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
 #: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
 #: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:5552
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "離開"
 
@@ -185,7 +185,7 @@
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:574
+#: plugins/docklet/docklet.c:172 src/gtkft.c:581
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
@@ -390,35 +390,6 @@
 "往上後向左拖曳為切換到前一個交談。\n"
 "往上後向右拖曳為切換到下一個交談。"
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Gnome Stock Ticker 選項"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "更新頻率（以分為單位）"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "在下面的輸入區中，以「+」符號做區隔。"
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "只顯示符號和價格："
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "選取這個選項，由左至右捲動："
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(無"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "變更"
-
 #: plugins/history.c:74
 msgid "History"
 msgstr "歷史記錄"
@@ -800,14 +771,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:194
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:197 plugins/ssl/ssl-gnutls.c:199
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -818,14 +789,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -887,11 +858,11 @@
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開（閒置）返回的通知訊息。"
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
@@ -1010,7 +981,7 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2365
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
 #: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "好友清單"
@@ -1063,13 +1034,12 @@
 "方式發佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-# NOTE  dnsq.org 的 DNS 好像死掉了 :-(
 #: src/about.c:99
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
-"SIZE=\"3\">正體中文化資訊:</FONT> <A HREF=\"http://myweb.hinet.net/home4/"
-"gaim/\">http://myweb.hinet.net/home4/gaim/</A><BR><BR>"
+"SIZE=\"3\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
+"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
 #: src/about.c:104
 msgid "Active Developers"
@@ -1106,172 +1076,172 @@
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:146
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:147
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:148
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:151
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:152
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:153
+#: src/about.c:145
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:156
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:164
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」，不是「語」；下同 :-)
-#: src/about.c:165 src/about.c:198
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:166 src/about.c:199
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:167
+#: src/about.c:159
 msgid "Danish"
 msgstr "丹麥文"
 
-# XXX 唉，不能寫「世界文」吧......
-#: src/about.c:168
-msgid "Esperanto"
-msgstr "世界語"
-
-#: src/about.c:169 src/about.c:200
+#: src/about.c:160
+msgid "British English"
+msgstr "英式英文"
+
+#: src/about.c:161 src/about.c:192
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:170 src/about.c:201
+#: src/about.c:162 src/about.c:193
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:171 src/about.c:202
+#: src/about.c:163 src/about.c:194
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:172 src/about.c:203
+#: src/about.c:164 src/about.c:195
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:173
+#: src/about.c:165
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:174
+#: src/about.c:166
 msgid "Hungarian"
 msgstr "匈牙利文"
 
 # NOTE 香港譯「意大利文」，但這是 zh-TW :-)
-#: src/about.c:175 src/about.c:205
+#: src/about.c:167 src/about.c:197
 msgid "Italian"
 msgstr "義大利文"
 
-#: src/about.c:176 src/about.c:207
+#: src/about.c:168 src/about.c:199
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-#: src/about.c:177
+# XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
+#: src/about.c:169
 msgid "Dutch; Flemish"
 msgstr "荷蘭文／法蘭德斯文"
 
-#: src/about.c:178
+#: src/about.c:170
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:179 src/about.c:208
+#: src/about.c:171 src/about.c:200
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:180
+#: src/about.c:172
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:181
+#: src/about.c:173
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:182
+#: src/about.c:174
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:183 src/about.c:209
+#: src/about.c:175 src/about.c:201
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:184
+#: src/about.c:176
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:185 src/about.c:211
+#: src/about.c:177 src/about.c:203
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:186
+#: src/about.c:178
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:186
+#: src/about.c:178
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:187
+#: src/about.c:179
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:188
+#: src/about.c:180
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:195
+#: src/about.c:187
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:196
+#: src/about.c:188
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:197
+#: src/about.c:189
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:204
+#: src/about.c:196
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:206
+#: src/about.c:198
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:210
+#: src/about.c:202
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:212
+#: src/about.c:204
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:225 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "關閉"
 
@@ -1309,36 +1279,36 @@
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
 #: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
-#: src/dialogs.c:1509 src/dialogs.c:1552 src/gtkblist.c:1731
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
 #: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
 #: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6203 src/protocols/oscar/oscar.c:6299
-#: src/protocols/oscar/oscar.c:6348 src/protocols/oscar/oscar.c:6430
-#: src/protocols/yahoo/yahoo.c:2291 src/request.h:852
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2380 src/protocols/yahoo/yahoo.c:2388
+#: src/request.h:852
 msgid "OK"
 msgstr "確定"
 
-#. Cancel button.
-#: src/account.c:337 src/account.c:371 src/buddy_chat.c:367
-#: src/connection.c:194 src/dialogs.c:352 src/dialogs.c:364 src/dialogs.c:377
-#: src/dialogs.c:398 src/dialogs.c:1334 src/dialogs.c:1493 src/dialogs.c:1510
-#: src/dialogs.c:1553 src/gtkaccount.c:1622 src/gtkaccount.c:2091
-#: src/gtkblist.c:1732 src/gtkblist.c:3667 src/gtkconn.c:148
-#: src/gtkprivacy.c:568 src/gtkprivacy.c:581 src/gtkprivacy.c:606
-#: src/gtkprivacy.c:617 src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
+#: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
+#: src/gtkblist.c:3670 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
+#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
 #: src/protocols/jabber/jabber.c:1024 src/protocols/msn/msn.c:182
 #: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
 #: src/protocols/oscar/oscar.c:2420 src/protocols/oscar/oscar.c:2457
 #: src/protocols/oscar/oscar.c:2492 src/protocols/oscar/oscar.c:2537
-#: src/protocols/oscar/oscar.c:6031 src/protocols/oscar/oscar.c:6204
-#: src/protocols/oscar/oscar.c:6300 src/protocols/oscar/oscar.c:6349
-#: src/protocols/oscar/oscar.c:6414 src/protocols/oscar/oscar.c:6431
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2292
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2381
+#: src/protocols/yahoo/yahoo.c:2389 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "取消"
 
@@ -1353,8 +1323,8 @@
 msgstr "儲存"
 
 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - 離開！"
+msgid "Away!"
+msgstr "離開！"
 
 #: src/away.c:269
 msgid "I'm Back!"
@@ -1376,12 +1346,12 @@
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:661 src/blist.c:849 src/blist.c:2060 src/gtkblist.c:3147
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1149
+#: src/blist.c:1148
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1393,29 +1363,29 @@
 "%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1158
+#: src/blist.c:1157
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1208 src/gtkaccount.c:159 src/gtkutils.c:849
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
 #: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1531
+#: src/blist.c:1530
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2177
+#: src/blist.c:2180
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2179
+#: src/blist.c:2182
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3559
+#: src/buddy_chat.c:212 src/gtkblist.c:3560
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1423,22 +1393,24 @@
 
 # TODO 看起來應該為加一個新的聊天室，並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/buddy_chat.c:326
-msgid "Join Chat"
+#: src/buddy_chat.c:223
+msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/buddy_chat.c:332
-msgid "Buddy Chat"
-msgstr "好友聊天室"
-
-#: src/buddy_chat.c:341
-msgid "Join Chat As:"
-msgstr "聊天室所屬帳號："
-
-#. Join button.
-#: src/buddy_chat.c:361
-msgid "Join"
-msgstr "加入"
+#: src/buddy_chat.c:225 src/gtkblist.c:924
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: src/buddy_chat.c:242
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
+
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:358
+msgid "_Account:"
+msgstr "帳號(_A)："
 
 #: src/connection.c:117 src/connection.c:165
 #, c-format
@@ -1527,15 +1499,15 @@
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:200
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:203
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/dialogs.c:219
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1547,37 +1519,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級，同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:228
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告？(_A)"
 
-#: src/dialogs.c:235
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:349
 #, 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:350 src/dialogs.c:351
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:361
 #, 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:362 src/dialogs.c:363
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:372
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1585,11 +1557,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎？"
 
-#: src/dialogs.c:375 src/dialogs.c:376
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1599,15 +1571,15 @@
 "作嗎？"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別；可能有改進的空間
-#: src/dialogs.c:396 src/dialogs.c:397
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:542
-msgid "New Message"
-msgstr "新訊息"
-
-#: src/dialogs.c:560
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "新即時訊息"
+
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "請輸入您所想要發送即時訊息對象的帳號。\n"
 
@@ -1615,10 +1587,6 @@
 msgid "_Screenname:"
 msgstr "帳號(_S)："
 
-#: src/dialogs.c:589 src/dialogs.c:664 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "帳號(_A)："
-
 #: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "取得使用者資訊"
@@ -1634,24 +1602,22 @@
 msgstr "加入連結"
 
 #: src/dialogs.c:759
-msgid "Insert"
-msgstr "插入"
-
-#: src/dialogs.c:781
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: src/dialogs.c:782
 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:799 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:632
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:809 src/gtkprefs.c:601 src/gtkprefs.c:1805
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "描述"
+#: src/dialogs.c:795
+msgid "_URL:"
+msgstr "_URL："
+
+#: src/dialogs.c:808
+msgid "_Description:"
+msgstr "描述(_D)："
 
 #: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
@@ -1703,12 +1669,8 @@
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:1489
-msgid "Alias chat"
-msgstr "給聊天室改別名"
-
 #: src/dialogs.c:1490
-msgid "Please enter an aliased name for this chat."
+msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
@@ -1717,55 +1679,35 @@
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:1506
-msgid "Alias contact"
-msgstr "給好友改別名"
-
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
 #: src/dialogs.c:1507
-msgid "Please enter an aliased name for this contact."
+msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:1538
-msgid "_Screenname"
-msgstr "帳號(_S)"
-
-#: src/dialogs.c:1543 src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
-msgid "_Alias"
-msgstr "別名(_A)"
-
-#: src/dialogs.c:1547
+#: src/dialogs.c:1524
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "請為 %s 輸入一個別名"
+
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/dialogs.c:1548
-msgid "Alias buddy"
-msgstr "為好友加上別名"
-
-# NOTE 這個譯句應該沒有問題。（執行「別名」來看實際使用情況）
-# NOTE 但我把「下列人員...」改為新的譯句...。
-#: src/dialogs.c:1549
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr "請為這個好友設定別名，或者更改他（她）在好友清單中所記錄的帳號。"
-
-#: src/ft.c:123
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:137
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s 找不到。\n"
 
-#: src/ft.c:713
+#: src/ft.c:754
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:715
+#: src/ft.c:756
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -1861,15 +1803,15 @@
 msgid "boring default"
 msgstr "無聊（預設）"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2327
+#: src/gaimrc.c:1259 src/gtkblist.c:2326
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2328
+#: src/gaimrc.c:1261 src/gtkblist.c:2327
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2329
+#: src/gaimrc.c:1263 src/gtkblist.c:2328
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -1906,12 +1848,11 @@
 msgid "Screenname:"
 msgstr "帳號："
 
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:163
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:307
 msgid "Password:"
 msgstr "密碼："
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3299 src/gtkblist.c:3618
+#: src/gtkaccount.c:469 src/gtkblist.c:3299 src/gtkblist.c:3619
 msgid "Alias:"
 msgstr "別名："
 
@@ -1994,11 +1935,11 @@
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T)："
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:860 src/gtkprefs.c:1127
 msgid "_Host:"
 msgstr "主機位址(_H)："
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "通訊埠(_P)："
 
@@ -2006,7 +1947,7 @@
 msgid "_Username:"
 msgstr "使用者(_U)："
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:877 src/gtkprefs.c:1179
 msgid "Pa_ssword:"
 msgstr "密碼(_S)："
 
@@ -2046,8 +1987,8 @@
 msgstr "帳號"
 
 #: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:6152 src/protocols/yahoo/yahoo.c:2086
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2175
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "上線"
@@ -2072,15 +2013,15 @@
 "您想將他（她）加入到您的好友名單中嗎？"
 
 #: src/gtkaccount.c:2084
-msgid "Gaim - Information"
-msgstr "Gaim - 資訊"
+msgid "Information"
+msgstr "資訊"
 
 #: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單？"
 
-#: src/gtkaccount.c:2090 src/gtkblist.c:3666 src/gtkconv.c:1251
-#: src/gtkconv.c:3068 src/gtkconv.c:4273 src/gtkrequest.c:200
+#: src/gtkaccount.c:2090 src/gtkblist.c:3669 src/gtkconv.c:1272
+#: src/gtkconv.c:3087 src/gtkconv.c:4292 src/gtkrequest.c:200
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "加入"
@@ -2101,7 +2042,12 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953
+#: src/gtkblist.c:840 src/gtkblist.c:929 src/gtkblist.c:948
+msgid "_Alias..."
+msgstr "別名(_A)..."
+
+#: src/gtkblist.c:842 src/gtkblist.c:931 src/gtkblist.c:953 src/gtkconn.c:424
+#: src/gtkconn.c:460
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2121,10 +2067,6 @@
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: src/gtkblist.c:924
-msgid "_Join"
-msgstr "加入(_J)"
-
 #: src/gtkblist.c:926
 msgid "Auto-Join"
 msgstr "自動加入"
@@ -2138,123 +2080,123 @@
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1392 src/gtkconv.c:3789
+#: src/gtkblist.c:1389 src/gtkconv.c:3808
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:1681
+#: src/gtkblist.c:1680
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:1682
+#: src/gtkblist.c:1681
 msgid "/Buddies/New _Instant Message..."
 msgstr "/好友/新即時訊息(_I)"
 
+#: src/gtkblist.c:1682
+msgid "/Buddies/Join a _Chat..."
+msgstr "/好友/加入聊天室(_C)"
+
 #: src/gtkblist.c:1683
-msgid "/Buddies/Join a _Chat..."
-msgstr "/好友/加入聊天室(_C)"
-
-#: src/gtkblist.c:1684
 msgid "/Buddies/Get _User Info..."
 msgstr "/好友/取得使用者資訊(_U)"
 
-#: src/gtkblist.c:1686
+#: src/gtkblist.c:1685
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
+#: src/gtkblist.c:1686
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/好友/顯示空白的群組(_E)"
+
 #: src/gtkblist.c:1687
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/好友/顯示空白的群組(_E)"
+msgid "/Buddies/_Add Buddy..."
+msgstr "/好友/新增好友(_A)..."
 
 #: src/gtkblist.c:1688
-msgid "/Buddies/_Add a Buddy..."
-msgstr "/好友/新增一個好友(_A)"
+msgid "/Buddies/Add C_hat..."
+msgstr "/好友/新增聊天室(_H)..."
 
 #: src/gtkblist.c:1689
-msgid "/Buddies/Add a C_hat..."
-msgstr "/好友/新增一個聊天室(_H)"
-
-#: src/gtkblist.c:1690
-msgid "/Buddies/Add a _Group..."
-msgstr "/好友/新增一個群組(_G)"
+msgid "/Buddies/Add _Group..."
+msgstr "/好友/新增群組(_G)..."
+
+#: src/gtkblist.c:1691
+msgid "/Buddies/_Signoff"
+msgstr "/好友/登出(_S)"
 
 #: src/gtkblist.c:1692
-msgid "/Buddies/_Signoff"
-msgstr "/好友/登出(_S)"
-
-#: src/gtkblist.c:1693
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1696
+#: src/gtkblist.c:1695
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:1697
+#: src/gtkblist.c:1696
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:1698
+#: src/gtkblist.c:1697
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1699
+#: src/gtkblist.c:1698
 msgid "/Tools/P_rotocol Actions"
 msgstr "/工具/通訊協定相關設定(_R)"
 
+#: src/gtkblist.c:1700
+msgid "/Tools/A_ccounts"
+msgstr "/工具/帳號清單(_C)"
+
 #: src/gtkblist.c:1701
-msgid "/Tools/A_ccounts"
-msgstr "/工具/帳號清單(_C)"
+msgid "/Tools/_File Transfers"
+msgstr "/工具/檔案傳輸(_F)"
 
 #: src/gtkblist.c:1702
-msgid "/Tools/_File Transfers"
-msgstr "/工具/檔案傳輸(_F)"
+msgid "/Tools/Pr_eferences"
+msgstr "/工具/偏好設定(_E)"
 
 #: src/gtkblist.c:1703
-msgid "/Tools/Preferences"
-msgstr "/工具/偏好設定"
-
-#: src/gtkblist.c:1704
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:1706
+#: src/gtkblist.c:1705
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:1709
+#: src/gtkblist.c:1708
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:1710
+#: src/gtkblist.c:1709
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:1711
+#: src/gtkblist.c:1710
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:1712
+#: src/gtkblist.c:1711
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:1728
+#: src/gtkblist.c:1727
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:1728
+#: src/gtkblist.c:1727
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:1729
+#: src/gtkblist.c:1728
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:1757
+#: src/gtkblist.c:1756
 #, c-format
 msgid ""
 "\n"
@@ -2263,16 +2205,16 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: src/gtkblist.c:1818 src/protocols/oscar/oscar.c:5532
+#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
-#: src/gtkblist.c:1830
+#: src/gtkblist.c:1829
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1845
+#: src/gtkblist.c:1844
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2280,10 +2222,18 @@
 "\n"
 "<b>帳號：</b>"
 
+#: src/gtkblist.c:1845
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>別名：</b>"
+
 #: src/gtkblist.c:1846
 msgid ""
 "\n"
-"<b>Contact Alias:</b>"
+"<b>Alias:</b>"
 msgstr ""
 "\n"
 "<b>別名：</b>"
@@ -2291,20 +2241,12 @@
 #: src/gtkblist.c:1847
 msgid ""
 "\n"
-"<b>Alias:</b>"
-msgstr ""
-"\n"
-"<b>別名：</b>"
-
-#: src/gtkblist.c:1848
-msgid ""
-"\n"
 "<b>Nickname:</b>"
 msgstr ""
 "\n"
 "<b>暱稱：</b>"
 
-#: src/gtkblist.c:1849
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2312,7 +2254,7 @@
 "\n"
 "<b>閒置：</b>"
 
-#: src/gtkblist.c:1850
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2320,7 +2262,7 @@
 "\n"
 "<b>警告：<b>"
 
-#: src/gtkblist.c:1852
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2328,7 +2270,7 @@
 "\n"
 "<b>介紹：</b>幽靈似的"
 
-#: src/gtkblist.c:1853
+#: src/gtkblist.c:1852
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2336,7 +2278,7 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:1854
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2344,81 +2286,81 @@
 "\n"
 "<b>狀態：</b>頂呱呱"
 
-#: src/gtkblist.c:2122
+#: src/gtkblist.c:2121
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置（%d 小時 %d 分）"
 
-#: src/gtkblist.c:2124
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置（%d 分）"
 
-#: src/gtkblist.c:2129
+#: src/gtkblist.c:2128
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2132
+#: src/gtkblist.c:2131
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:2325 src/gtkprefs.c:841 src/gtkprefs.c:1497
+#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "無"
 
-#: src/gtkblist.c:2392
+#: src/gtkblist.c:2391
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:2395
+#: src/gtkblist.c:2394
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:2398
+#: src/gtkblist.c:2397
 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:2485
+#: src/gtkblist.c:2484
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:2505 src/gtkconv.c:1210
+#: src/gtkblist.c:2504 src/gtkconv.c:1231
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:2511
+#: src/gtkblist.c:2510
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:2514 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2519
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:2523 src/protocols/oscar/oscar.c:3089
+#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:2528
+#: src/gtkblist.c:2527
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:2536
+#: src/gtkblist.c:2535
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3241 src/protocols/yahoo/yahoo.c:2218
+#: src/gtkblist.c:3241 src/protocols/yahoo/yahoo.c:2307
 msgid "Add Buddy"
 msgstr "新增好友"
 
@@ -2435,38 +2377,34 @@
 msgid "Screen Name:"
 msgstr "帳號："
 
-#: src/gtkblist.c:3312 src/gtkblist.c:3629
+#: src/gtkblist.c:3312 src/gtkblist.c:3632
 msgid "Group:"
 msgstr "群組："
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3321 src/gtkblist.c:3599
+#: src/gtkblist.c:3321 src/gtkblist.c:3600
 msgid "Account:"
 msgstr "帳號："
 
-#: src/gtkblist.c:3566
+#: src/gtkblist.c:3567
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:3589
+#: src/gtkblist.c:3590
 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:3663
+#: src/gtkblist.c:3666
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:3663
-msgid "Add a new group"
-msgstr "新增群組"
-
-#: src/gtkblist.c:3664
+#: src/gtkblist.c:3667
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:4184
 msgid "No actions available"
 msgstr "不允許任何動作"
 
@@ -2486,8 +2424,12 @@
 msgid "Cancel All"
 msgstr "全部取消"
 
+#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:526
+msgid "_Reconnect"
+msgstr "重新連線(_R)"
+
 # XXX 暫譯
-#: src/gtkconn.c:409
+#: src/gtkconn.c:490
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2500,375 +2442,375 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:411
+#: src/gtkconn.c:492
 msgid "Reason Unknown."
 msgstr "理由不明。"
 
-#: src/gtkconn.c:420
-msgid "Reconnect"
-msgstr "重新連線"
-
-#: src/gtkconn.c:459
+#: src/gtkconn.c:531
+msgid "Reconnect _All"
+msgstr "全部重新連線(_A)"
+
+#: src/gtkconn.c:554
 msgid "Account"
 msgstr "帳號"
 
-#: src/gtkconn.c:467
+#: src/gtkconn.c:562
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:187
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:185 src/gtkft.c:1065
+#: src/gtkconv.c:188 src/gtkft.c:1076
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎？"
 
-#: src/gtkconv.c:240
+#: src/gtkconv.c:243
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像：%s\n"
 
-#: src/gtkconv.c:310
-msgid "Gaim - Insert Image"
-msgstr "Gaim - 插入影像"
-
-#: src/gtkconv.c:606
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - 邀請好友進入聊天室"
+#: src/gtkconv.c:313
+msgid "Insert Image"
+msgstr "插入影像"
+
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:634
+#: src/gtkconv.c:648
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱，以及邀請的訊息。"
 
-#: src/gtkconv.c:655
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "好友(_B)："
 
-#: src/gtkconv.c:675
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "訊息(_M)："
 
-#: src/gtkconv.c:759
+#: src/gtkconv.c:775
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:777
+#: src/gtkconv.c:793
 msgid "_Search for:"
 msgstr "搜尋(_S)："
 
-#: src/gtkconv.c:1218
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1220 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊，但不肯定，看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1229 src/gtkconv.c:3091
+#: src/gtkconv.c:1250 src/gtkconv.c:3110
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1238
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:1249 src/gtkconv.c:3074 src/gtkconv.c:4258
+#: src/gtkconv.c:1270 src/gtkconv.c:3093 src/gtkconv.c:4277
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkconv.c:2325
+#: src/gtkconv.c:2343
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2333
+#: src/gtkconv.c:2351
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西，不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2436
+#: src/gtkconv.c:2454
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:2858
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 儲存聊天內容"
+#: src/gtkconv.c:2875
+msgid "Save Conversation"
+msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:2875
+#: src/gtkconv.c:2892
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2877
-msgid "/Conversation/_New Conversation..."
-msgstr "/交談/新交談(_N))..."
-
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2894
+msgid "/Conversation/New _Instant Message..."
+msgstr "/好友/新即時訊息(_I)..."
+
+#: src/gtkconv.c:2899
+msgid "/Conversation/_Find..."
+msgstr "/交談/搜尋(_F)..."
+
+#: src/gtkconv.c:2900
+msgid "/Conversation/View _Log"
+msgstr "/交談/觀看歷史記錄(_L)"
+
+#: src/gtkconv.c:2901
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2884
-msgid "/Conversation/View _Log"
-msgstr "/交談/觀看歷史記錄(_L)"
-
-#: src/gtkconv.c:2885
-msgid "/Conversation/Find..."
-msgstr "/交談/搜尋..."
-
-#: src/gtkconv.c:2889
+#: src/gtkconv.c:2906
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2891
-msgid "/Conversation/A_lias..."
-msgstr "/交談/別名(_L)..."
-
-#: src/gtkconv.c:2893
-msgid "/Conversation/_Get Info..."
-msgstr "/交談/取得資訊(_G)..."
-
-#: src/gtkconv.c:2895
+#: src/gtkconv.c:2908
+msgid "/Conversation/_Get Info"
+msgstr "/交談/取得資訊(_G)"
+
+#: src/gtkconv.c:2910
+msgid "/Conversation/_Warn..."
+msgstr "/交談/警告(_W)..."
+
+#: src/gtkconv.c:2912
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2900
-msgid "/Conversation/Insert _URL..."
-msgstr "/交談/插入 URL(_U)"
-
-#: src/gtkconv.c:2902
-msgid "/Conversation/Insert _Image..."
-msgstr "/交談/插入影像(_I)"
-
-#: src/gtkconv.c:2907
-msgid "/Conversation/_Warn..."
-msgstr "/交談/警告(_W)..."
-
-#: src/gtkconv.c:2909
+#: src/gtkconv.c:2917
+msgid "/Conversation/A_lias..."
+msgstr "/交談/別名(_L)..."
+
+#: src/gtkconv.c:2919
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2921
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2913
+#: src/gtkconv.c:2923
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2918
+#: src/gtkconv.c:2928
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/交談/插入連結(_k)..."
+
+#: src/gtkconv.c:2930
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/交談/插入影像(_E)..."
+
+#: src/gtkconv.c:2935
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2922
+#: src/gtkconv.c:2939
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2923
+#: src/gtkconv.c:2940
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:2941
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2925
+#: src/gtkconv.c:2942
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:2967
+#: src/gtkconv.c:2984
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:2972
+#: src/gtkconv.c:2989
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:2976
-msgid "/Conversation/Alias..."
-msgstr "/交談/別名..."
-
-#: src/gtkconv.c:2980
-msgid "/Conversation/Get Info..."
-msgstr "/交談/取得資訊..."
-
-#: src/gtkconv.c:2984
+#: src/gtkconv.c:2995
+msgid "/Conversation/Get Info"
+msgstr "/交談/取得資訊"
+
+#: src/gtkconv.c:2999
+msgid "/Conversation/Warn..."
+msgstr "/交談/警告..."
+
+#: src/gtkconv.c:3003
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:2990
-msgid "/Conversation/Insert URL..."
-msgstr "/交談/插入 URL..."
-
-#: src/gtkconv.c:2994
-msgid "/Conversation/Insert Image..."
-msgstr "/交談/插入影像..."
-
-#: src/gtkconv.c:3000
-msgid "/Conversation/Warn..."
-msgstr "/交談/警告..."
-
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3009
+msgid "/Conversation/Alias..."
+msgstr "/交談/別名..."
+
+#: src/gtkconv.c:3013
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3008
+#: src/gtkconv.c:3017
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3012
+#: src/gtkconv.c:3021
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3018
+#: src/gtkconv.c:3027
+msgid "/Conversation/Insert Link..."
+msgstr "/交談/插入連結..."
+
+#: src/gtkconv.c:3031
+msgid "/Conversation/Insert Image..."
+msgstr "/交談/插入影像..."
+
+#: src/gtkconv.c:3037
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3021
+#: src/gtkconv.c:3040
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3024
+#: src/gtkconv.c:3043
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3048 src/gtkconv.c:3050 src/gtkconv.c:3148 src/gtkconv.c:3150
-#: src/gtkconv.c:5968
+#: src/gtkconv.c:3067 src/gtkconv.c:3069 src/gtkconv.c:3167 src/gtkconv.c:3169
+#: src/gtkconv.c:5987
 msgid "Send"
 msgstr "送出"
 
-#: src/gtkconv.c:3071 src/gtkconv.c:4276
+#: src/gtkconv.c:3090 src/gtkconv.c:4295
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3077 src/gtkconv.c:4261
+#: src/gtkconv.c:3096 src/gtkconv.c:4280
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
 #. Warn button
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:3103
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3088
+#: src/gtkconv.c:3107
 msgid "Warn the user"
 msgstr "警告使用者"
 
-#: src/gtkconv.c:3095 src/gtkconv.c:3534
+#: src/gtkconv.c:3114 src/gtkconv.c:3553
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Block button
-#: src/gtkconv.c:3098 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3117 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3102
+#: src/gtkconv.c:3121
 msgid "Block the user"
 msgstr "封鎖使用者"
 
 #. Invite
-#: src/gtkconv.c:3160 src/gtkconv.c:5971
+#: src/gtkconv.c:3179 src/gtkconv.c:5990
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3182
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3202
+#: src/gtkconv.c:3221
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkconv.c:3213
+#: src/gtkconv.c:3232
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3243
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkconv.c:3240
+#: src/gtkconv.c:3259
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkconv.c:3265
+#: src/gtkconv.c:3284
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3301
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3313
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3325
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3340
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkconv.c:3332
+#: src/gtkconv.c:3351
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3362
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtkconv.c:3403
+#: src/gtkconv.c:3422
 msgid "Topic:"
 msgstr "主題："
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3454
+#: src/gtkconv.c:3473
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3511
+#: src/gtkconv.c:3530
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3542
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4074
+#: src/gtkconv.c:4093
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4661 src/gtkconv.c:4693 src/gtkconv.c:4814 src/gtkconv.c:4881
+#: src/gtkconv.c:4680 src/gtkconv.c:4712 src/gtkconv.c:4833 src/gtkconv.c:4900
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5215
+#: src/gtkconv.c:5234
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:5220
+#: src/gtkconv.c:5239
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:5226
+#: src/gtkconv.c:5245
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:5705 src/gtkconv.c:5708
+#: src/gtkconv.c:5724 src/gtkconv.c:5727
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
@@ -2884,81 +2826,81 @@
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:207
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自：</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:210
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到：</b>"
 
-#: src/gtkft.c:451
+#: src/gtkft.c:458
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:458
+#: src/gtkft.c:465
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:465
+#: src/gtkft.c:472
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:472
+#: src/gtkft.c:479
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:502
+#: src/gtkft.c:509
 msgid "Filename:"
 msgstr "檔名："
 
-#: src/gtkft.c:503
+#: src/gtkft.c:510
 msgid "Status:"
 msgstr "狀態："
 
-#: src/gtkft.c:504
+#: src/gtkft.c:511
 msgid "Speed:"
 msgstr "速度："
 
-#: src/gtkft.c:505
+#: src/gtkft.c:512
 msgid "Time Elapsed:"
 msgstr "經過時間："
 
-#: src/gtkft.c:506
+#: src/gtkft.c:513
 msgid "Time Remaining:"
 msgstr "尚需時間："
 
-#: src/gtkft.c:603
+#: src/gtkft.c:610
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:613
+#: src/gtkft.c:620
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:622
+#: src/gtkft.c:629
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:623
+#: src/gtkft.c:630
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:665 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:675
+#: src/gtkft.c:682
 msgid "_Resume"
 msgstr "恢復(_R)"
 
@@ -2970,60 +2912,61 @@
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1042
+#: src/gtkft.c:1053
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
-#: src/gtkft.c:1051
+#: src/gtkft.c:1062
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/gtkft.c:1064
+#: src/gtkft.c:1075
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
-#: src/gtkft.c:1089
-msgid "Gaim - Open..."
-msgstr "Gaim - 開啟..."
-
-#: src/gtkft.c:1091 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - 儲存為..."
-
-#: src/gtkft.c:1138
+#: src/gtkft.c:1100
+msgid "Open..."
+msgstr "開啟..."
+
+# XXX 要覆查
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "另存新檔..."
+
+#: src/gtkft.c:1149
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkimhtml.c:688
+#: src/gtkimhtml.c:691
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:700
+#: src/gtkimhtml.c:703
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:710
+#: src/gtkimhtml.c:713
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:1891
+#: src/gtkimhtml.c:1849
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式，暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:1899
+#: src/gtkimhtml.c:1857
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤：%s"
 
-#: src/gtkimhtml.c:1908
+#: src/gtkimhtml.c:1866
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:1931
+#: src/gtkimhtml.c:1889
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3038,17 +2981,17 @@
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:219
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自：</span> %s\n"
 
-#: src/gtknotify.c:227
+#: src/gtknotify.c:224
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題：</span> %s\n"
 
-#: src/gtknotify.c:232
+#: src/gtknotify.c:228
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3059,7 +3002,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:247
+#: src/gtknotify.c:243
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3070,21 +3013,21 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
+#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:433
+#: src/gtknotify.c:429
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」，卻未有設定指令。"
 
-#: src/gtknotify.c:450
+#: src/gtknotify.c:446
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "瀏覽器「%s」是無效的。"
 
-#: src/gtknotify.c:457
+#: src/gtknotify.c:453
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "執行「指令」時發生了錯誤：%s"
@@ -3133,7 +3076,7 @@
 msgstr "由離開返回"
 
 #: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2082
+#: src/protocols/yahoo/yahoo.c:2171
 msgid "Idle"
 msgstr "閒置"
 
@@ -3250,6 +3193,11 @@
 msgid "Icon"
 msgstr "圖示"
 
+#: src/gtkprefs.c:601 src/gtkprefs.c:1805 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:738
+msgid "Description"
+msgstr "描述"
+
 #: src/gtkprefs.c:668
 msgid "Style"
 msgstr "風格"
@@ -3556,23 +3504,9 @@
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1127
-msgid "_Host"
-msgstr "主機位址(_H)"
-
-#: src/gtkprefs.c:1144 src/protocols/irc/irc.c:555
-#: src/protocols/jabber/jabber.c:1155 src/protocols/msn/msn.c:1660
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "通訊埠"
-
 #: src/gtkprefs.c:1162
-msgid "_User"
-msgstr "使用者(_U)"
-
-#: src/gtkprefs.c:1179
-msgid "Pa_ssword"
-msgstr "密碼(_S)"
+msgid "_User:"
+msgstr "使用者(_U)："
 
 #: src/gtkprefs.c:1216
 msgid "Opera"
@@ -3777,7 +3711,7 @@
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
 #: src/gtkprefs.c:1776 src/protocols/jabber/jabber.c:582
-#: src/protocols/msn/msn.c:1348 src/protocols/trepia/trepia.c:401
+#: src/protocols/msn/msn.c:1350 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "名稱"
 
@@ -4020,13 +3954,13 @@
 "launched: %s"
 msgstr "無法播放音效，因為無法執行所設定的音效指令：%s"
 
-#: src/gtkutils.c:296
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "無法儲存圖示檔案磁碟上。"
 
-#: src/gtkutils.c:331
-msgid "Gaim - Save Icon"
-msgstr "Gaim - 儲存圖示"
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "儲存圖示"
 
 #: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -4145,8 +4079,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2363
-#: src/protocols/yahoo/yahoo.c:2464
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2474
+#: src/protocols/yahoo/yahoo.c:2583
 msgid "Available"
 msgstr "上線"
 
@@ -4160,9 +4094,9 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
 #: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:6158 src/protocols/yahoo/yahoo.c:2080
-#: src/protocols/yahoo/yahoo.c:2383 src/protocols/yahoo/yahoo.c:2474
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2593
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4219,7 +4153,7 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/toc/toc.c:200 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:140
+#: src/protocols/yahoo/yahoo_filexfer.c:141
 msgid "Unable to connect."
 msgstr "無法連結。"
 
@@ -4282,7 +4216,7 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3960
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "帳號"
 
@@ -4292,12 +4226,12 @@
 
 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:3968 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3962
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "暱稱"
 
@@ -4312,18 +4246,18 @@
 
 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1284
-#: src/protocols/msn/msn.c:1528 src/protocols/napster/napster.c:387
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
 #: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2641
-#: src/protocols/yahoo/yahoo.c:2663 src/protocols/yahoo/yahoo.c:2686
-#: src/protocols/yahoo/yahoo.c:2844 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2766
+#: src/protocols/yahoo/yahoo.c:2788 src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2969 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "好友資訊"
 
@@ -4423,7 +4357,7 @@
 msgstr "名錄搜尋"
 
 #: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1041
-#: src/protocols/oscar/oscar.c:6513 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -4477,14 +4411,14 @@
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
 #: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
-#: src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
 #: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
-#: src/protocols/oscar/oscar.c:5141
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4563,8 +4497,12 @@
 msgstr "顯示是日訊息 (MOTD)"
 
 #: src/protocols/irc/irc.c:158
-msgid "Channel:"
-msgstr "頻道："
+msgid "_Channel:"
+msgstr "頻道(_C)："
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "密碼(_P)："
 
 #: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
@@ -4607,6 +4545,12 @@
 msgid "Server"
 msgstr "伺服器"
 
+#: src/protocols/irc/irc.c:555 src/protocols/jabber/jabber.c:1155
+#: src/protocols/msn/msn.c:1662 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1345
+msgid "Port"
+msgstr "通訊埠"
+
 #: src/protocols/irc/irc.c:558
 msgid "Encoding"
 msgstr "編碼"
@@ -4640,7 +4584,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2744
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2869
 msgid "Realname"
 msgstr "姓名"
 
@@ -4691,103 +4635,107 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "沒有那個頻道"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出：(%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "錯誤：來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲：%lu秒"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s："
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "（為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項）"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時：%lu 秒"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "已停止連線"
 
@@ -4795,68 +4743,69 @@
 msgid "Server requires SSL for login"
 msgstr "登入這個伺服器需要使用 SSL"
 
-#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:311
-#: src/protocols/jabber/auth.c:411 src/protocols/jabber/auth.c:423
+#: src/protocols/jabber/auth.c:60 src/protocols/jabber/auth.c:153
+#: src/protocols/jabber/auth.c:312 src/protocols/jabber/auth.c:412
+#: src/protocols/jabber/auth.c:424
 msgid "Invalid response from server"
 msgstr "無效的伺服器回應"
 
-#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:175
+#: src/protocols/jabber/auth.c:101 src/protocols/jabber/auth.c:176
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
-#: src/protocols/jabber/auth.c:164 src/protocols/jabber/jabber.c:458
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/jabber.c:458
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
 # XXX 好像有些怪，譯文有待改進
-#: src/protocols/jabber/auth.c:332
+#: src/protocols/jabber/auth.c:333
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/auth.c:426
+#: src/protocols/jabber/auth.c:427
 msgid "Bad Protocol"
 msgstr "無效的協定"
 
 # NOTE Jabber 協定中 SASL Error 的一種，即 <encryption-required/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:429
+#: src/protocols/jabber/auth.c:430
 msgid "Encryption Required"
 msgstr "必須加密才可使用給定的認證機制"
 
-#: src/protocols/jabber/auth.c:432
+#: src/protocols/jabber/auth.c:433
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/auth.c:435
+#: src/protocols/jabber/auth.c:436
 msgid "Invalid Mechanism"
 msgstr "機制無效"
 
 # FIXME 要覆查譯文，很可能譯錯了
 # NOTE Jabber 協定中 SASL Error 的一種，即 <invalid-realm/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:437
+#: src/protocols/jabber/auth.c:438
 msgid "Invalid Realm"
 msgstr "領域無效"
 
 # XXX 要覆查譯文
 # NOTE Jabber 協定中 SASL Error 的一種，即 <mechanism-too-weak/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/auth.c:440
+#: src/protocols/jabber/auth.c:441
 msgid "Mechanism Too Weak"
 msgstr "認證機制太弱"
 
-#: src/protocols/jabber/auth.c:443 src/protocols/jabber/jabber.c:147
+#: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5560
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "未認證"
 
-#: src/protocols/jabber/auth.c:446
+#: src/protocols/jabber/auth.c:447
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/auth.c:448
+#: src/protocols/jabber/auth.c:449
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
@@ -4873,10 +4822,14 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2740
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2865
 msgid "Nickname"
 msgstr "暱稱"
 
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:632
+msgid "URL"
+msgstr "URL"
+
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
 msgid "Street Address"
 msgstr "街道地址"
@@ -4910,7 +4863,7 @@
 msgstr "電話"
 
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2736
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2861
 msgid "Email"
 msgstr "電子郵件"
 
@@ -4931,7 +4884,7 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "生日"
 
@@ -4972,7 +4925,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "地址"
 
@@ -5018,17 +4971,17 @@
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "聊天室："
+#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:938
+msgid "_Room:"
+msgstr "聊天室(_R)："
 
 #: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "伺服器："
+msgid "_Server:"
+msgstr "伺服器(_S)："
 
 #: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "暱稱："
+msgid "_Handle:"
+msgstr "暱稱(_H)："
 
 #: src/protocols/jabber/chat.c:158
 #, c-format
@@ -5194,20 +5147,20 @@
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:234 src/protocols/msn/httpmethod.c:234
 #: 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:536 src/protocols/msn/msn.c:707
-#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:762
-#: src/protocols/msn/msn.c:770 src/protocols/msn/msn.c:803
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:834 src/protocols/msn/msn.c:849
-#: src/protocols/msn/msn.c:859 src/protocols/msn/msn.c:881
-#: src/protocols/msn/msn.c:931 src/protocols/msn/msn.c:969
-#: src/protocols/msn/msn.c:1067 src/protocols/msn/msn.c:1099
-#: src/protocols/msn/msn.c:1120 src/protocols/msn/msn.c:1131
-#: src/protocols/msn/msn.c:1142 src/protocols/msn/msn.c:1166
-#: src/protocols/msn/msn.c:1178 src/protocols/msn/msn.c:1259
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
 #: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
 #: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
@@ -5270,14 +5223,14 @@
 msgstr "電子郵件"
 
 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3965
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4017
-#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "省／州"
@@ -5299,9 +5252,9 @@
 msgstr "註冊新的 Jabber 帳戶"
 
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1972
+#: src/protocols/yahoo/yahoo.c:2057
 msgid "Connecting"
 msgstr "連線中"
 
@@ -5318,7 +5271,7 @@
 msgstr "串流重新初始中"
 
 #: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:297
+#: src/protocols/jabber/presence.c:296
 msgid "Error"
 msgstr "錯誤"
 
@@ -5334,7 +5287,7 @@
 
 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
 #: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
-#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:6154
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -5367,8 +5320,7 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1034 src/protocols/oscar/oscar.c:6499
-#: src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1034 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -5431,11 +5383,11 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
 
-#: src/protocols/jabber/presence.c:287 src/protocols/oscar/oscar.c:2950
+#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/presence.c:292
 msgid "Unable to join chat"
 msgstr "無法加入聊天室"
 
@@ -5489,23 +5441,23 @@
 msgid "Unable to parse message."
 msgstr "無法解析訊息。"
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2146 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1764
-#: src/protocols/yahoo/yahoo.c:1795 src/protocols/yahoo/yahoo.c:1860
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1849
+#: src/protocols/yahoo/yahoo.c:1880 src/protocols/yahoo/yahoo.c:1945
 msgid "Unable to connect"
 msgstr "無法連線"
 
 #: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
-#: src/protocols/msn/notification.c:2168
+#: src/protocols/msn/notification.c:2171
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2175
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2178
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2189
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2192
 msgid "Error reading from server"
 msgstr "由伺服器讀取時發生錯誤"
 
@@ -5772,41 +5724,41 @@
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2194
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2283
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態：</b>%s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:626
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2062
-#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2465
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2151
+#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2584
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2064
-#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2466
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2153
+#: src/protocols/yahoo/yahoo.c:2478 src/protocols/yahoo/yahoo.c:2585
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2072
-#: src/protocols/yahoo/yahoo.c:2375 src/protocols/yahoo/yahoo.c:2470
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2161
+#: src/protocols/yahoo/yahoo.c:2486 src/protocols/yahoo/yahoo.c:2589
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2076
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/yahoo/yahoo.c:2472
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2165
+#: src/protocols/yahoo/yahoo.c:2490 src/protocols/yahoo/yahoo.c:2591
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:636
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "隱藏"
@@ -5848,7 +5800,7 @@
 msgid "SSL support is needed for MSN. Please install it."
 msgstr "MSN 需要 SSL 程式庫的支援，請安裝相關的程式庫。"
 
-#: src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5857,11 +5809,11 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "無效的 MSN 使用者帳號"
 
-#: src/protocols/msn/msn.c:783
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5870,74 +5822,74 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的拒絕清單。"
 
-#: src/protocols/msn/msn.c:1285 src/protocols/yahoo/yahoo.c:2642
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2767
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1355 src/protocols/oscar/oscar.c:3999
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2877
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1362 src/protocols/oscar/oscar.c:3985
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/yahoo/yahoo.c:2885
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1370 src/protocols/yahoo/yahoo.c:2756
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2881
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1377 src/protocols/yahoo/yahoo.c:2748
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2873
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1385 src/protocols/yahoo/yahoo.c:2764
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2889
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1408
-#: src/protocols/msn/msn.c:1415 src/protocols/msn/msn.c:1422
-#: src/protocols/msn/msn.c:1429
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1451
-#: src/protocols/msn/msn.c:1458
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1467 src/protocols/msn/msn.c:1473
-#: src/protocols/msn/msn.c:1480
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1489 src/protocols/msn/msn.c:1495
-#: src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2924
 msgid "Favorite Quote"
 msgstr "至愛名言"
 
-#: src/protocols/msn/msn.c:1503 src/protocols/yahoo/yahoo.c:2835
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2960
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1514 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1536 src/protocols/yahoo/yahoo.c:2850
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2975
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2852
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2977
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
@@ -5951,15 +5903,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1636 src/protocols/msn/msn.c:1638
+#: src/protocols/msn/msn.c:1638 src/protocols/msn/msn.c:1640
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1655 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1657 src/protocols/trepia/trepia.c:1340
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1665
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6037,7 +5989,7 @@
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:2109
+#: src/protocols/msn/notification.c:2112
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6118,10 +6070,10 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5211
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "加入哪個群組："
+msgid "_Group:"
+msgstr "群組(_G)："
 
 #. *< api_version
 #. *< type
@@ -6283,8 +6235,8 @@
 msgstr "連線已建立，並已送出 Cookie"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:204
+#: src/protocols/yahoo/yahoo_filexfer.c:212
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
@@ -6292,8 +6244,8 @@
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:200
-#: src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:205
+#: src/protocols/yahoo/yahoo_filexfer.c:213
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
@@ -6353,7 +6305,7 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5661
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
@@ -6376,7 +6328,7 @@
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6030
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "連線"
 
@@ -6406,8 +6358,8 @@
 #: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
 #: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
 #: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5132
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -6424,7 +6376,7 @@
 "使用者 %u 因為下列原因，想要將您加入他（她）的好友清單中：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5138
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "認證要求"
 
@@ -6540,18 +6492,18 @@
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -6591,12 +6543,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6256
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6248
-#: src/protocols/yahoo/yahoo.c:2243
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2332
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -6711,138 +6663,138 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3678
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線，因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3711
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4020 src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4058
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)？ (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4129
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4150
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4206
 #, 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:4207
+#: src/protocols/oscar/oscar.c:4209
 #, 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:4210
+#: src/protocols/oscar/oscar.c:4212
 #, 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:4213
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6850,7 +6802,7 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6858,19 +6810,19 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4219
+#: src/protocols/oscar/oscar.c:4221
 #, 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:4222
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6879,20 +6831,20 @@
 "您的帳號目前被格式化如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4233 src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6901,7 +6853,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6911,15 +6863,15 @@
 "truncated it for you."
 msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4503
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4521
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6928,7 +6880,7 @@
 "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4561
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6938,15 +6890,15 @@
 "truncated it for you."
 msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4566
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:4781
+#: src/protocols/oscar/oscar.c:4783
 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 "
@@ -6955,12 +6907,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失，可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/oscar/oscar.c:4874
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5045
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6969,15 +6921,15 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5045 src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5059
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6987,7 +6939,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6997,11 +6949,11 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7011,18 +6963,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5174
+#: src/protocols/oscar/oscar.c:5176
 #, 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:5175
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7032,112 +6984,113 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5179
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5216 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "聊天室號碼："
-
-#: src/protocols/oscar/oscar.c:5454
+# NOTE: KingAnt 提供的字義有些不同，暫時不予理會
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "頻道號碼(_E)："
+
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間：</b>"
 
-#: src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 位址：</b>"
 
-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性：</b>"
 
-#: src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:5502
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>好友說明：</b>"
 
-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>上線：</b>"
 
-#: src/protocols/oscar/oscar.c:5519
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>離開訊息：</b>"
 
-#: src/protocols/oscar/oscar.c:5528
+#: src/protocols/oscar/oscar.c:5538
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態：</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5562 src/protocols/yahoo/yahoo.c:2084
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2173
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6036
 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:6201
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "好友說明："
 
-#: src/protocols/oscar/oscar.c:6217
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6240
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6269
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6291
+#: src/protocols/oscar/oscar.c:6301
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6297
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "新的帳號格式："
 
-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6393
+#: src/protocols/oscar/oscar.c:6403
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7145,66 +7098,74 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:6418
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6419
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6420
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "搜尋"
 
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "上線訊息："
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:6438
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作，但覺得很悶，同我聊聊天吧！"
 
-#: src/protocols/oscar/oscar.c:6506
-msgid "Set Available Message"
-msgstr "設定上線訊息"
-
-#: src/protocols/oscar/oscar.c:6520
+#: src/protocols/oscar/oscar.c:6509
+msgid "Set User Info..."
+msgstr "設定使用者資訊..."
+
+#: src/protocols/oscar/oscar.c:6516
+msgid "Set Available Message..."
+msgstr "設定上線訊息..."
+
+#: src/protocols/oscar/oscar.c:6523
+msgid "Change Password..."
+msgstr "修改密碼..."
+
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6528
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6539
-msgid "Format Screenname"
-msgstr "格式化帳號"
-
-#: src/protocols/oscar/oscar.c:6545
+#: src/protocols/oscar/oscar.c:6549
+msgid "Format Screenname..."
+msgstr "格式化帳號..."
+
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6551
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6557
-msgid "Change Current Registered Address"
-msgstr "修改目前所註冊的地址"
-
-#: src/protocols/oscar/oscar.c:6566
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
+msgstr "修改目前所註冊的地址..."
+
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6574
-msgid "Search for Buddy by Email"
-msgstr "使用電子郵件地址搜尋好友"
+#: src/protocols/oscar/oscar.c:6584
+msgid "Search for Buddy by Email..."
+msgstr "使用電子郵件地址搜尋好友..."
 
 #. *< api_version
 #. *< type
@@ -7216,15 +7177,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6695 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6719
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -7408,6 +7369,10 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - 儲存為..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7529,16 +7494,22 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:715
+#: src/protocols/yahoo/yahoo.c:726
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:773
+# XXX 暫譯
+#: src/protocols/yahoo/yahoo.c:768
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s 的 Yahoo! 系統訊息："
+
+#: src/protocols/yahoo/yahoo.c:834
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他（她）新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:775
+#: src/protocols/yahoo/yahoo.c:837
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7547,11 +7518,11 @@
 "使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:776
+#: src/protocols/yahoo/yahoo.c:840
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1426
+#: src/protocols/yahoo/yahoo.c:1490
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7561,11 +7532,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式，因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/yahoo/yahoo.c:1493
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1502
+#: src/protocols/yahoo/yahoo.c:1566
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7574,62 +7545,68 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他（她）從您的好友清單中移除，並"
 "隨即忽略他（她），請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1505
+#: src/protocols/yahoo/yahoo.c:1569
 msgid "Ignore buddy?"
 msgstr "忽略使用者？"
 
-#: src/protocols/yahoo/yahoo.c:1534
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1537
+#: src/protocols/yahoo/yahoo.c:1605
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: src/protocols/yahoo/yahoo.c:1540
-msgid "Unknown error."
-msgstr "未知錯誤。"
-
-#: src/protocols/yahoo/yahoo.c:1587
+# XXX 暫譯
+#: src/protocols/yahoo/yahoo.c:1608
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "你的帳戶目前被封鎖。請您登入 Yahoo 網站。"
+
+#: src/protocols/yahoo/yahoo.c:1611
+#, c-format
+msgid "Unknown error number %d."
+msgstr "未知的錯誤代碼 %d。"
+
+#: src/protocols/yahoo/yahoo.c:1668
 #, 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:1589
+#: src/protocols/yahoo/yahoo.c:1670
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1695 src/protocols/yahoo/yahoo.c:1825
+#: src/protocols/yahoo/yahoo.c:1780 src/protocols/yahoo/yahoo.c:1910
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:1850 src/protocols/yahoo/yahoo.c:1959
-#: src/protocols/yahoo/yahoo.c:1983
+#: src/protocols/yahoo/yahoo.c:1935 src/protocols/yahoo/yahoo.c:2044
+#: src/protocols/yahoo/yahoo.c:2071
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2066 src/protocols/yahoo/yahoo.c:2369
-#: src/protocols/yahoo/yahoo.c:2467
+#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2480
+#: src/protocols/yahoo/yahoo.c:2586
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2068 src/protocols/yahoo/yahoo.c:2371
-#: src/protocols/yahoo/yahoo.c:2468
+#: src/protocols/yahoo/yahoo.c:2157 src/protocols/yahoo/yahoo.c:2482
+#: src/protocols/yahoo/yahoo.c:2587
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2070 src/protocols/yahoo/yahoo.c:2373
-#: src/protocols/yahoo/yahoo.c:2469
+#: src/protocols/yahoo/yahoo.c:2159 src/protocols/yahoo/yahoo.c:2484
+#: src/protocols/yahoo/yahoo.c:2588
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2074 src/protocols/yahoo/yahoo.c:2377
-#: src/protocols/yahoo/yahoo.c:2471
+#: src/protocols/yahoo/yahoo.c:2163 src/protocols/yahoo/yahoo.c:2488
+#: src/protocols/yahoo/yahoo.c:2590
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2078 src/protocols/yahoo/yahoo.c:2381
-#: src/protocols/yahoo/yahoo.c:2473
+#: src/protocols/yahoo/yahoo.c:2167 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2592
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -7637,78 +7614,88 @@
 # 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:2142 src/protocols/yahoo/yahoo.c:2174
+#: src/protocols/yahoo/yahoo.c:2231 src/protocols/yahoo/yahoo.c:2263
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2319
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2236
+#: src/protocols/yahoo/yahoo.c:2325
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2378
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID？"
 
-#: src/protocols/yahoo/yahoo.c:2300
-msgid "Activate ID"
-msgstr "啟動 ID"
-
-#: src/protocols/yahoo/yahoo.c:2659
+# NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天
+# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
+#: src/protocols/yahoo/yahoo.c:2386
+msgid "Join who in chat?"
+msgstr "加入哪個好友目前所在的聊天室？"
+
+#: src/protocols/yahoo/yahoo.c:2397
+msgid "Activate ID..."
+msgstr "啟動 ID..."
+
+#: src/protocols/yahoo/yahoo.c:2403
+msgid "Join user in chat..."
+msgstr "加入好友目前所在的聊天室..."
+
+#: src/protocols/yahoo/yahoo.c:2784
 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:2660 src/protocols/yahoo/yahoo.c:2683
+#: src/protocols/yahoo/yahoo.c:2785 src/protocols/yahoo/yahoo.c:2808
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "您如果想看這則個人資訊，請用您的瀏覽器開啟以下連結<br>"
 
-#: src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/yahoo/yahoo.c:2807
 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:2730 src/protocols/yahoo/yahoo.c:2731
+#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2856
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo.c:2775 src/protocols/yahoo/yahoo.c:2778
-#: src/protocols/yahoo/yahoo.c:2781
+#: src/protocols/yahoo/yahoo.c:2900 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/yahoo/yahoo.c:2906
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:2790 src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2915 src/protocols/yahoo/yahoo.c:2918
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:2807
+#: src/protocols/yahoo/yahoo.c:2932
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/yahoo/yahoo.c:2944
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:2823
+#: src/protocols/yahoo/yahoo.c:2948
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2950
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
 # XXX 改譯「註冊日期」會否比較通順？
-#: src/protocols/yahoo/yahoo.c:2831
+#: src/protocols/yahoo/yahoo.c:2956
 msgid "Member Since"
 msgstr "成為成員的時間"
 
@@ -7722,23 +7709,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3006 src/protocols/yahoo/yahoo.c:3008
+#: src/protocols/yahoo/yahoo.c:3157 src/protocols/yahoo/yahoo.c:3159
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3025
+#: src/protocols/yahoo/yahoo.c:3176
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3030
+#: src/protocols/yahoo/yahoo.c:3179
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3182
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3185
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
@@ -7751,19 +7738,19 @@
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限？"
 
-#: src/protocols/yahoo/yahoochat.c:531
+#: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
 msgstr "可能他（她）並不在聊天室內？"
 
@@ -7811,19 +7798,19 @@
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "類別／聊天室："
+msgid "_Class:"
+msgstr "類別／聊天室(_C)："
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "實體／頻道："
+msgid "_Instance:"
+msgstr "實體／頻道(_I)："
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "接受者："
+msgid "_Recipient:"
+msgstr "接受者(_R)："
 
 #. *< api_version
 #. *< type
@@ -7839,11 +7826,22 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
-#: src/proxy.c:1692
+# TODO Untranslated
+#. Forbidden
+#: src/proxy.c:1002
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr ""
+
+#: src/proxy.c:1004
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "代理伺服器連線錯誤 %d"
+
+#: src/proxy.c:1721
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: src/proxy.c:1692
+#: src/proxy.c:1721
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7924,53 +7922,152 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "不好意思，我離開一下下！"
 
-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/util.c:1790
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:1793
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
 
-#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 
-#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: src/util.c:2180
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
-#: src/win32/win32dep.c:254
+#: src/win32/win32dep.c:271
 msgid "Moving Gaim Settings.."
 msgstr "移動設定檔案中..."
 
-#: src/win32/win32dep.c:257
+#: src/win32/win32dep.c:274
 msgid "Moving Gaim user settings to: "
 msgstr "包含 Gaim 的使用者設定的目錄現在移至："
 
-#: src/win32/win32dep.c:259
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "通知"
 
+# XXX 唉，不能寫「世界文」吧......
+#~ msgid "Esperanto"
+#~ msgstr "世界語"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - 離開！"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim - 資訊"
+
+#~ msgid "/Conversation/_New Conversation..."
+#~ msgstr "/交談/新交談(_N))..."
+
+#~ msgid "/Conversation/Insert _Image..."
+#~ msgstr "/交談/插入影像(_I)"
+
+#~ msgid "/Conversation/Insert URL..."
+#~ msgstr "/交談/插入 URL..."
+
+#~ msgid "Port:"
+#~ msgstr "通訊埠："
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - 儲存圖示"
+
+#~ msgid "Unknown error."
+#~ msgstr "未知錯誤。"
+
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "Gnome Stock Ticker 選項"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "更新頻率（以分為單位）"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "在下面的輸入區中，以「+」符號做區隔。"
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "只顯示符號和價格："
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "選取這個選項，由左至右捲動："
+
+#~ msgid "(No"
+#~ msgstr "(無"
+
+#~ msgid "Change"
+#~ msgstr "變更"
+
+#~ msgid "New Message"
+#~ msgstr "新訊息"
+
+#~ msgid "Add a new group"
+#~ msgstr "新增群組"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - 插入影像"
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/交談/插入 URL(_U)"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "聊天室所屬帳號："
+
+#~ msgid "Alias chat"
+#~ msgstr "給聊天室改別名"
+
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#~ msgid "Alias contact"
+#~ msgstr "給好友改別名"
+
+#~ msgid "_Screenname"
+#~ msgstr "帳號(_S)"
+
+#~ msgid "Alias buddy"
+#~ msgstr "為好友加上別名"
+
+# NOTE 這個譯句應該沒有問題。（執行「別名」來看實際使用情況）
+# NOTE 但我把「下列人員...」改為新的譯句...。
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr "請為這個好友設定別名，或者更改他（她）在好友清單中所記錄的帳號。"
+
+#~ msgid "Join what group:"
+#~ msgstr "加入哪個群組："
+
+#~ msgid "Buddy Chat"
+#~ msgstr "好友聊天室"
+
+#~ msgid "Join"
+#~ msgstr "加入"
+
+#~ msgid "_Host"
+#~ msgstr "主機位址(_H)"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "密碼(_S)"
+
 #~ msgid "Changing info for %s:"
 #~ msgstr "修改 %s 的資訊："
 
@@ -8359,9 +8456,6 @@
 #~ msgid "has become idle."
 #~ msgstr "變更狀態為閒置。"
 
-#~ msgid "Port:"
-#~ msgstr "通訊埠："
-
 #~ msgid "Deny all users"
 #~ msgstr "拒絕所有使用者"
 
@@ -8450,9 +8544,6 @@
 #~ msgid "Add Deny"
 #~ msgstr "加入拒絕"
 
-#~ msgid "_Group:"
-#~ msgstr "群組(_G)："
-
 #~ msgid "_Alias:"
 #~ msgstr "別名(_A)："