# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1064531362 0
# Node ID bb353268bb9e7e4d69e22d46c0ec9a7f23dc5422
# Parent  a83687eeb713d0e1b1d82733dab23d5fae3944db
[gaim-migrate @ 7529]
and the translations just keep coming in

committer: Tailor Script <tailor@pidgin.im>

diff -r a83687eeb713 -r bb353268bb9e ChangeLog
--- a/ChangeLog	Thu Sep 25 22:14:36 2003 +0000
+++ b/ChangeLog	Thu Sep 25 23:09:22 2003 +0000
@@ -1,5 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
+
 version 0.70:
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Portuguese (Portugal) translation updated (Duarte Henriques)
 
 version 0.69 (09/24/2003):
diff -r a83687eeb713 -r bb353268bb9e po/zh_TW.po
--- a/po/zh_TW.po	Thu Sep 25 22:14:36 2003 +0000
+++ b/po/zh_TW.po	Thu Sep 25 23:09:22 2003 +0000
@@ -1,5 +1,5 @@
 # Gaim Traditional Chinese translation
-# Copyright (C) 2002-2003, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2002-August 2003, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) May-August 2003, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
@@ -17,15 +17,16 @@
 # XXX  「email address」應為「電子郵件地址」，但這樣寫太長了，
 #       是否可譯成「電郵地址」？
 # NOTE  中文統一用「」引號；URL、指令等該用'/"者除外
-# NOTE 「deny」一詞已停用；「block」改譯「拒絕」，但需要時可譯「封鎖」
+# NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖)，現在不分了
+# NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫，有時用封鎖比較好。
 # NOTE  改「Custom」為「自訂」並無不可，只是「使用者自訂」一詞
 #       為目前通用的譯法，大多數的繁體中文軟體皆採此種譯文。
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.67\n"
-"POT-Creation-Date: 2003-09-21 00:19-0400\n"
+"Project-Id-Version: Gaim 0.69\n"
+"POT-Creation-Date: 2003-09-24 23:26-0400\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -101,12 +102,12 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1792 src/gtkpounce.c:461
 #: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4601 src/protocols/oscar/oscar.c:5519
-#: src/protocols/oscar/oscar.c:5913
+#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3533
+#: src/protocols/jabber/jabber.c:3587 src/protocols/oscar/oscar.c:2841
+#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
+#: src/protocols/oscar/oscar.c:5912
 msgid "Away"
 msgstr "離開"
 
@@ -127,7 +128,7 @@
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2325 src/main.c:325
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -139,11 +140,11 @@
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:476
+#: plugins/docklet/docklet.c:478
 msgid "Tray Icon Configuration"
 msgstr "工作匣圖示設定"
 
-#: plugins/docklet/docklet.c:480
+#: plugins/docklet/docklet.c:482
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
@@ -154,20 +155,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:504
+#: plugins/docklet/docklet.c:506
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:507
+#: plugins/docklet/docklet.c:509
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
 # NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:511
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -812,8 +813,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1633
+#: src/gtkprefs.c:2258
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -833,7 +834,7 @@
 
 #. Conversations
 #: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2256
+#: src/gtkprefs.c:2259
 msgid "Conversations"
 msgstr "交談"
 
@@ -909,158 +910,158 @@
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:136
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:137
+#: src/about.c:145
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:138
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:141
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:142
+#: src/about.c:150
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:143
+#: src/about.c:151
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:146
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:154
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:155 src/about.c:183
+#: src/about.c:163 src/about.c:192
 msgid "Catalan"
 msgstr "加泰隆文"
 
 # NOTE 寫出來的是「文」，不是「語」；下同 :-)
-#: src/about.c:156 src/about.c:184
+#: src/about.c:164 src/about.c:193
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:157
+#: src/about.c:165
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:158 src/about.c:185
+#: src/about.c:166 src/about.c:194
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:159 src/about.c:186
+#: src/about.c:167 src/about.c:195
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:160 src/about.c:187
+#: src/about.c:168 src/about.c:196
 msgid "French"
 msgstr "法文"
 
 # XXX Yahoo是這樣譯的，但可能不太對
-#: src/about.c:161
+#: src/about.c:169
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:162
+#: src/about.c:170
 msgid "Hungarian"
 msgstr "匈牙利文"
 
 # NOTE 香港譯「意大利文」，但這是 zh-TW :-)
-#: src/about.c:163 src/about.c:189
+#: src/about.c:171 src/about.c:198
 msgid "Italian"
 msgstr "義大利文"
 
-#: src/about.c:164 src/about.c:191
+#: src/about.c:172 src/about.c:200
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-#: src/about.c:165
+#: src/about.c:173
 msgid "Dutch; Flemish"
 msgstr "荷蘭文、法蘭德斯文"
 
-#: src/about.c:166
+#: src/about.c:174 src/about.c:202
+msgid "Polish"
+msgstr "波蘭文"
+
+#: src/about.c:175
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:167
+#: src/about.c:176
 msgid "Portuguese-Portugal"
 msgstr "標準萄文"
 
-#: src/about.c:168
+#: src/about.c:177
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:169 src/about.c:194
+#: src/about.c:178 src/about.c:203
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:170
+#: src/about.c:179
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:171 src/about.c:196
+#: src/about.c:180 src/about.c:205
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:172
+#: src/about.c:181
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:173
+#: src/about.c:182
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:180
+#: src/about.c:189
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:181
+#: src/about.c:190
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:182
+#: src/about.c:191
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:188
+#: src/about.c:197
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:190
+#: src/about.c:199
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:192
+#: src/about.c:201
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:193
-msgid "Polish"
-msgstr "波蘭文"
-
 # XXX Yahoo譯法
-#: src/about.c:195
+#: src/about.c:204
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:197
+#: src/about.c:206
 msgid "Chinese"
 msgstr "中文"
 
-#: src/about.c:210 src/dialogs.c:3509 src/gtkrequest.c:191
+#: src/about.c:219 src/dialogs.c:3509 src/gtkrequest.c:191
 #: src/protocols/msn/msn.c:240 src/server.c:1567
 msgid "Close"
 msgstr "關閉"
@@ -1085,16 +1086,16 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:538 src/gtkprefs.c:2258
+#: src/blist.c:547 src/gtkprefs.c:2261
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:633 src/blist.c:799 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
+#: src/blist.c:642 src/blist.c:808 src/dialogs.c:872
+#: src/protocols/jabber/jabber.c:1919 src/protocols/msn/notification.c:1135
 msgid "Buddies"
 msgstr "好友"
 
-#: src/blist.c:1065
+#: src/blist.c:1074
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1106,25 +1107,25 @@
 "%d 個在 %s 群組的好友並沒有被移除，因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1074
+#: src/blist.c:1083
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1125 src/gtkaccount.c:140 src/gtkpounce.c:307
+#: src/blist.c:1134 src/gtkaccount.c:140 src/gtkpounce.c:307
 #: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1435
+#: src/blist.c:1452
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2215
+#: src/blist.c:2232
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
 
-#: src/blist.c:2217
+#: src/blist.c:2234
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1186,14 +1187,14 @@
 #: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
 #: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
 #: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4202
 #: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
 #: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2425
-#: src/protocols/oscar/oscar.c:2462 src/protocols/oscar/oscar.c:2497
-#: src/protocols/oscar/oscar.c:2542 src/protocols/oscar/oscar.c:5791
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6055
-#: src/protocols/oscar/oscar.c:6119 src/protocols/trepia/trepia.c:379
+#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2420
+#: src/protocols/oscar/oscar.c:2457 src/protocols/oscar/oscar.c:2492
+#: src/protocols/oscar/oscar.c:2537 src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
+#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
 #: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
 #: src/request.h:823
 msgid "Cancel"
@@ -1223,9 +1224,9 @@
 #: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
 #: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
 #: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2461 src/protocols/oscar/oscar.c:2541
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/yahoo/yahoo.c:1631
+#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
+#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
+#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
 #: src/request.h:813
 msgid "OK"
 msgstr "確定"
@@ -1333,6 +1334,7 @@
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎？"
 
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別；可能有改進的空間
 #: src/dialogs.c:485 src/dialogs.c:486
 msgid "Remove Buddy"
 msgstr "移除好友"
@@ -1366,9 +1368,10 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr ""
-"您正試著將群組 %s 及相關的 %d 個成員從您的好友清單中移除。您要繼"
-"續這個動作嗎？"
-
+"您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動作"
+"嗎？"
+
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別；可能有改進的空間
 #: src/dialogs.c:531 src/dialogs.c:532
 msgid "Remove Contact"
 msgstr "移除好友"
@@ -1389,8 +1392,6 @@
 msgid "_Account:"
 msgstr "帳號(_A)："
 
-# XXX 「取得使用者資訊」是正確譯法，但它實在太長了，令畫面很奇怪 (GTK Layout Bug?)
-# ANS Never Mind
 #: src/dialogs.c:760
 msgid "Get User Info"
 msgstr "取得使用者資訊"
@@ -1415,7 +1416,7 @@
 
 #: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
 #: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2694 src/prpl.c:163
+#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
 msgid "Add"
 msgstr "加入"
 
@@ -1489,7 +1490,7 @@
 msgstr "允許在 Web 搜尋來檢視您的個人資訊"
 
 #. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3969
+#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
 #: src/protocols/trepia/trepia.c:299
 msgid "First Name"
 msgstr "名"
@@ -1502,7 +1503,7 @@
 
 #. Line 3
 #: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3972 src/protocols/trepia/trepia.c:306
+#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
 msgid "Last Name"
 msgstr "姓"
 
@@ -1514,26 +1515,26 @@
 
 #. Line 5
 #: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4018 src/protocols/oscar/oscar.c:4034
+#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
 #: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
 msgid "City"
 msgstr "城市"
 
 #. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4021
-#: src/protocols/oscar/oscar.c:4037 src/protocols/trepia/trepia.c:367
+#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
+#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
 #: src/protocols/trepia/trepia.c:471
 msgid "State"
 msgstr "省╱州"
 
 #. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
+#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3731
 #: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
 msgid "Country"
 msgstr "國家"
 
 #: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
+#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4201
 #: src/protocols/trepia/trepia.c:378
 msgid "Save"
 msgstr "儲存"
@@ -1547,7 +1548,7 @@
 msgstr "請完成所有表格的填寫。"
 
 #: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6186
+#: src/protocols/jabber/jabber.c:4420 src/protocols/oscar/oscar.c:6185
 #: src/protocols/toc/toc.c:1534
 msgid "Change Password"
 msgstr "修改密碼"
@@ -1569,8 +1570,8 @@
 msgid "New Password (again)"
 msgstr "新密碼（再次確認）"
 
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6172 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4406
+#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -1599,7 +1600,7 @@
 msgid "Find Buddy By Email"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
+#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3733
 #: src/protocols/yahoo/yahoo.c:2041
 msgid "Email"
 msgstr "電子郵件"
@@ -1618,12 +1619,12 @@
 "The description is optional.\n"
 msgstr "請輸入您所要插入的 URL 及它的描述，描述是選擇性的，可不用輸入。\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3725
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1804
-#: src/protocols/jabber/jabber.c:3737
+#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1807
+#: src/protocols/jabber/jabber.c:3739
 msgid "Description"
 msgstr "描述"
 
@@ -1884,11 +1885,11 @@
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1269
+#: src/gaimrc.c:1269 src/gtkblist.c:1596
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1271
+#: src/gaimrc.c:1271 src/gtkblist.c:1597
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -1908,7 +1909,7 @@
 "<b>檔案大小：</b> %s\n"
 "<b>圖像尺寸：</b> %d×%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3091
+#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -2056,11 +2057,11 @@
 msgstr "刪除"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2852
-#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:5912
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:872
-#: src/protocols/zephyr/zephyr.c:882
+#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3531
+#: src/protocols/jabber/jabber.c:3581 src/protocols/oscar/oscar.c:2847
+#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
+#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
+#: src/protocols/zephyr/zephyr.c:883
 msgid "Online"
 msgstr "上線"
 
@@ -2228,7 +2229,7 @@
 "\n"
 "<b>帳號：</b>%s"
 
-#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5499
+#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5498
 msgid "<b>Status:</b> Offline"
 msgstr "<b>狀態：</b>離線"
 
@@ -2324,58 +2325,58 @@
 msgid "None"
 msgstr "無"
 
-#: src/gtkblist.c:1659
+#: src/gtkblist.c:1657
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1660
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1663
 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:1748
+#: src/gtkblist.c:1746
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:1750
+#: src/gtkblist.c:1748
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:1768 src/gtkconv.c:1073
+#: src/gtkblist.c:1766 src/gtkconv.c:1073
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkblist.c:1774
+#: src/gtkblist.c:1772
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1775 src/protocols/napster/napster.c:531
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1781
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3100
+#: src/gtkblist.c:1784 src/protocols/oscar/oscar.c:3095
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gtkblist.c:1791
+#: src/gtkblist.c:1789
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:1799
+#: src/gtkblist.c:1797
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:2846
+#: src/gtkblist.c:2859
 msgid "No actions available"
 msgstr "不允許任何動作"
 
@@ -2450,7 +2451,7 @@
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3491
+#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3493
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
@@ -2626,8 +2627,6 @@
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
-# FIXME 以前分「Deny」(拒絕) 和「Block」(封鎖)，現在不分了，不知怎樣譯比較好（上同）
-# ANS 拒絕可以說等同於封鎖和某一個使用者的聯繫，因此我覺得用封鎖比較好。
 #. Block button
 #: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
@@ -3019,7 +3018,7 @@
 msgid "Browse"
 msgstr "瀏覽"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2082
+#: src/gtkpounce.c:518 src/gtkprefs.c:2085
 msgid "Test"
 msgstr "測試"
 
@@ -3292,14 +3291,10 @@
 msgid "Right"
 msgstr "視窗右側"
 
-# XXX 要複查有無錯譯
-# ANS No Problem
 #: src/gtkprefs.c:922
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-# XXX 要複查有無錯譯
-# ANS No Problem
 #. XXX: grey this out when the above is unchecked
 #: src/gtkprefs.c:926
 msgid "Show IMs and chats in _same tabbed window"
@@ -3337,8 +3332,6 @@
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-# XXX Enable 譯「開啟」好像有點奇怪，改譯「使用」有沒有問題？
-# ANS 改為「啟動」？
 #: src/gtkprefs.c:995
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
@@ -3401,7 +3394,7 @@
 msgstr "主機位址(_H)"
 
 #: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1528
+#: src/protocols/jabber/jabber.c:4530 src/protocols/msn/msn.c:1529
 #: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
 msgid "Port"
 msgstr "通訊埠"
@@ -3515,14 +3508,10 @@
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-# XXX 「模式」這樣用是否有點奇怪？
-# ANS 修更譯文 by Paladin
 #: src/gtkprefs.c:1392
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-# XXX「Method」譯「模式」好像有些怪
-# ANS 修更譯文 by Paladin
 #: src/gtkprefs.c:1393
 msgid "_Method:"
 msgstr "播放方式(_M)："
@@ -3638,98 +3627,98 @@
 "<span weight=\"bold\">網站：</span>  %s\n"
 "<span weight=\"bold\">檔名：</span>  %s"
 
-#: src/gtkprefs.c:1768
+#: src/gtkprefs.c:1771
 msgid "Load"
 msgstr "載入"
 
 # NOTE 只能譯「名稱」，因為同時解作「人名」及「模組名稱」
-#: src/gtkprefs.c:1775 src/protocols/msn/msn.c:1283
+#: src/gtkprefs.c:1778 src/protocols/msn/msn.c:1284
 #: src/protocols/trepia/trepia.c:433
 msgid "Name"
 msgstr "名稱"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1825
 msgid "Details"
 msgstr "詳細資料"
 
-#: src/gtkprefs.c:1949
+#: src/gtkprefs.c:1952
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2056
+#: src/gtkprefs.c:2059
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2063
+#: src/gtkprefs.c:2066
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2086
+#: src/gtkprefs.c:2089
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2090
+#: src/gtkprefs.c:2093
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2217
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2253
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2254
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2255
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2256
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2257
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2260
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2262
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2265
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2267
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2268
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2269
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2270
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2271
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2274
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4109,10 +4098,10 @@
 msgid "Away for friends only"
 msgstr "離開（只有好友可以看到我）"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2850
-#: src/protocols/oscar/oscar.c:4589 src/protocols/oscar/oscar.c:4616
-#: src/protocols/oscar/oscar.c:5918 src/protocols/yahoo/yahoo.c:1425
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3536
+#: src/protocols/jabber/jabber.c:3599 src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
+#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
 #: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
 msgid "Invisible"
 msgstr "隱身"
@@ -4232,7 +4221,7 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3964
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
 msgid "UIN"
 msgstr "帳號"
 
@@ -4241,7 +4230,7 @@
 msgstr "名"
 
 #: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3966
+#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
 msgid "Nick"
 msgstr "暱稱"
 
@@ -4396,17 +4385,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1808
 #: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
+#: src/protocols/oscar/oscar.c:5152
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1809
 #: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2624
-#: src/protocols/oscar/oscar.c:5154
+#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:5153
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4496,7 +4485,7 @@
 
 #. Splits
 #: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4514 src/protocols/napster/napster.c:639
+#: src/protocols/jabber/jabber.c:4516 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "伺服器"
 
@@ -4689,10 +4678,10 @@
 #: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
 #: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
 #: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1086
-#: src/protocols/msn/msn.c:1097 src/protocols/msn/msn.c:1108
-#: src/protocols/msn/msn.c:1132 src/protocols/msn/msn.c:1144
-#: src/protocols/msn/msn.c:1209 src/protocols/msn/notification.c:179
+#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
+#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
+#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
+#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
 #: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
 #: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
@@ -4718,238 +4707,238 @@
 msgstr "您所輸入的新密碼和舊密碼是一樣的。所以密碼沒有被改變。"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3530
-#: src/protocols/jabber/jabber.c:3581
+#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3583
 msgid "Chatty"
 msgstr "想聊天"
 
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3589
+#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3534
+#: src/protocols/jabber/jabber.c:3591
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2840
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:5914
+#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3535
+#: src/protocols/jabber/jabber.c:3595 src/protocols/oscar/oscar.c:2835
+#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: src/protocols/jabber/jabber.c:1513
+#: src/protocols/jabber/jabber.c:1514
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber 錯誤 %s"
 
-#: src/protocols/jabber/jabber.c:1618
+#: src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Error %s: %s"
 msgstr "錯誤 %s：%s"
 
-#: src/protocols/jabber/jabber.c:1621
+#: src/protocols/jabber/jabber.c:1623
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時，發生了未知的錯誤"
 
-#: src/protocols/jabber/jabber.c:1799
+#: src/protocols/jabber/jabber.c:1801
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他（她）的好友清單中。"
 
-#: src/protocols/jabber/jabber.c:1827
+#: src/protocols/jabber/jabber.c:1829
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr "Jabber 使用者 %s 並不存在，所以將不會加入到您的名單中。"
 
-#: src/protocols/jabber/jabber.c:1830
+#: src/protocols/jabber/jabber.c:1832
 msgid "No such user."
 msgstr "沒有這個使用者。"
 
-#: src/protocols/jabber/jabber.c:1994
+#: src/protocols/jabber/jabber.c:1996
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:2028
+#: src/protocols/jabber/jabber.c:2030
 msgid "Unknown login error"
 msgstr "未知的登入錯誤"
 
-#: src/protocols/jabber/jabber.c:2378
+#: src/protocols/jabber/jabber.c:2380
 msgid "Password successfully changed."
 msgstr "密碼修改成功。"
 
-#: src/protocols/jabber/jabber.c:2423 src/protocols/jabber/jabber.c:4332
+#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:4334
 msgid "Connection lost"
 msgstr "失去連線"
 
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
-#: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
+#: src/protocols/jabber/jabber.c:2427 src/protocols/jabber/jabber.c:2461
+#: src/protocols/jabber/jabber.c:4336 src/protocols/jabber/jabber.c:4385
 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
 #: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
 #: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/jabber/jabber.c:2430
+#: src/protocols/jabber/jabber.c:2432
 msgid "Connected"
 msgstr "連線成功"
 
-#: src/protocols/jabber/jabber.c:2433
+#: src/protocols/jabber/jabber.c:2435
 msgid "Requesting Authentication Method"
 msgstr "要求認證的方式中"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
+#: src/protocols/jabber/jabber.c:2455 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
 #: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:2779
+#: src/protocols/jabber/jabber.c:2781
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "使用者 %s 是一個無效的 Jabber 帳號，所以不會被加入到名單中。"
 
-#: src/protocols/jabber/jabber.c:2781
+#: src/protocols/jabber/jabber.c:2783
 msgid "Unable to add buddy."
 msgstr "無法加入好友。"
 
-#: src/protocols/jabber/jabber.c:2782
+#: src/protocols/jabber/jabber.c:2784
 msgid "Jabber Error"
 msgstr "Jabber 錯誤"
 
-#: src/protocols/jabber/jabber.c:3041 src/protocols/yahoo/yahoochat.c:833
+#: src/protocols/jabber/jabber.c:3043 src/protocols/yahoo/yahoochat.c:833
 msgid "Room:"
 msgstr "聊天室："
 
-#: src/protocols/jabber/jabber.c:3046
+#: src/protocols/jabber/jabber.c:3048
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/protocols/jabber/jabber.c:3052
+#: src/protocols/jabber/jabber.c:3054
 msgid "Handle:"
 msgstr "暱稱："
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3084
 msgid "Unable to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/jabber/jabber.c:3318 src/protocols/jabber/jabber.c:3369
-#: src/protocols/jabber/jabber.c:3791
+#: src/protocols/jabber/jabber.c:3320 src/protocols/jabber/jabber.c:3371
+#: src/protocols/jabber/jabber.c:3793
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/jabber.c:3319
+#: src/protocols/jabber/jabber.c:3321
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/jabber.c:3370 src/protocols/jabber/jabber.c:3429
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3817
+#: src/protocols/jabber/jabber.c:3372 src/protocols/jabber/jabber.c:3431
+#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3819
 msgid "Status"
 msgstr "狀態"
 
-#: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5527
+#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3464
+#: src/protocols/oscar/oscar.c:5526
 msgid "Not Authorized"
 msgstr "未認證"
 
-#: src/protocols/jabber/jabber.c:3479
+#: src/protocols/jabber/jabber.c:3481
 msgid "View Error Msg"
 msgstr "觀看錯誤訊息"
 
-#: src/protocols/jabber/jabber.c:3498
+#: src/protocols/jabber/jabber.c:3500
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/jabber.c:3501
+#: src/protocols/jabber/jabber.c:3503
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#: src/protocols/jabber/jabber.c:3508
+#: src/protocols/jabber/jabber.c:3510
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/jabber.c:3516
+#: src/protocols/jabber/jabber.c:3518
 msgid "Re-request authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/jabber/jabber.c:3719
+#: src/protocols/jabber/jabber.c:3721
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/jabber.c:3720
+#: src/protocols/jabber/jabber.c:3722
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/jabber.c:3723
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/jabber.c:3724 src/protocols/yahoo/yahoo.c:2045
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/jabber.c:3724
+#: src/protocols/jabber/jabber.c:3726
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/jabber.c:3725
+#: src/protocols/jabber/jabber.c:3727
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/jabber.c:3726
-msgid "Locality"
-msgstr "市╱村"
-
-#: src/protocols/jabber/jabber.c:3727
-msgid "Region"
-msgstr "省╱州"
-
 #: src/protocols/jabber/jabber.c:3728
+msgid "Locality"
+msgstr "市╱村"
+
+#: src/protocols/jabber/jabber.c:3729
+msgid "Region"
+msgstr "省╱州"
+
+#: src/protocols/jabber/jabber.c:3730
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/jabber.c:3732
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:3732
-msgid "Organization Name"
-msgstr "所屬機構"
-
-#: src/protocols/jabber/jabber.c:3733
-msgid "Organization Unit"
-msgstr "所屬部門"
-
 #: src/protocols/jabber/jabber.c:3734
+msgid "Organization Name"
+msgstr "所屬機構"
+
+#: src/protocols/jabber/jabber.c:3735
+msgid "Organization Unit"
+msgstr "所屬部門"
+
+#: src/protocols/jabber/jabber.c:3736
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/jabber.c:3737
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3998
+#: src/protocols/jabber/jabber.c:3738 src/protocols/oscar/oscar.c:3997
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/jabber.c:4194 src/protocols/jabber/jabber.c:4195
+#: src/protocols/jabber/jabber.c:4196 src/protocols/jabber/jabber.c:4197
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4196
+#: src/protocols/jabber/jabber.c:4198
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/jabber.c:4269
+#: src/protocols/jabber/jabber.c:4271
 msgid "Server Registration successful!"
 msgstr "伺服器註冊成功！"
 
-#: src/protocols/jabber/jabber.c:4285
+#: src/protocols/jabber/jabber.c:4287
 #, c-format
 msgid "Error %d: %s"
 msgstr "錯誤 %d：%s"
 
-#: src/protocols/jabber/jabber.c:4290
+#: src/protocols/jabber/jabber.c:4292
 msgid "Unknown registration error"
 msgstr "未知的註冊錯誤"
 
@@ -4963,20 +4952,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4493 src/protocols/jabber/jabber.c:4495
+#: src/protocols/jabber/jabber.c:4495 src/protocols/jabber/jabber.c:4497
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4517
+#: src/protocols/jabber/jabber.c:4519
 msgid "Resource"
 msgstr "資源"
 
-#: src/protocols/jabber/jabber.c:4523
+#: src/protocols/jabber/jabber.c:4525
 msgid "Use SSL"
 msgstr "使用 SSL"
 
-#: src/protocols/jabber/jabber.c:4532
+#: src/protocols/jabber/jabber.c:4534
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -5158,8 +5147,6 @@
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-# XXX「unavailable」譯「不存在」好像很奇怪，可能有待改進
-# ANS「伺服器目前不提供服務」?!
 #: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
 #: src/protocols/msn/error.c:198
 msgid "Server unavailable"
@@ -5219,7 +5206,7 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1087
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
 #: src/protocols/toc/toc.c:662
 msgid "Authentication failed"
 msgstr "認證失敗"
@@ -5335,7 +5322,7 @@
 msgstr "外出用餐"
 
 #: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:869 src/protocols/zephyr/zephyr.c:884
+#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
 msgid "Hidden"
 msgstr "隱藏"
 
@@ -5394,63 +5381,63 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的拒絕清單。"
 
-#: src/protocols/msn/msn.c:1227 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1287 src/protocols/oscar/oscar.c:4003
+#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
 #: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
 #: src/protocols/yahoo/yahoo.c:2057
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1291 src/protocols/oscar/oscar.c:3989
+#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
 #: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
 #: src/protocols/yahoo/yahoo.c:2065
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1295 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1299 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1303 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1316 src/protocols/msn/msn.c:1323
-#: src/protocols/msn/msn.c:1331 src/protocols/msn/msn.c:1339
-#: src/protocols/msn/msn.c:1346
+#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
+#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
+#: src/protocols/msn/msn.c:1347
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1352 src/protocols/msn/msn.c:1365
-#: src/protocols/msn/msn.c:1372
+#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
+#: src/protocols/msn/msn.c:1373
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1385
-#: src/protocols/msn/msn.c:1392
+#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
+#: src/protocols/msn/msn.c:1393
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
+#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
 #: src/protocols/yahoo/yahoo.c:2089
 msgid "Favorite Quote"
 msgstr "至愛名言"
 
-#: src/protocols/msn/msn.c:1409 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1416 src/protocols/trepia/trepia.c:321
+#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
 #: src/protocols/trepia/trepia.c:489
 msgid "Homepage"
 msgstr "網頁"
@@ -5465,11 +5452,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1504 src/protocols/msn/msn.c:1506
+#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1523 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
 msgid "Login server"
 msgstr "登入伺服器"
 
@@ -5617,7 +5604,7 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5224
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
 #: src/protocols/toc/toc.c:1261
 msgid "Join what group:"
 msgstr "加入哪個群組："
@@ -5769,45 +5756,45 @@
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:791 src/protocols/oscar/oscar.c:1178
+#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:798
+#: src/protocols/oscar/oscar.c:796
 msgid "Connection established, cookie sent"
 msgstr "連線已建立，並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:865 src/protocols/oscar/oscar.c:878
-#: src/protocols/oscar/oscar.c:883
+#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "File Transfer Aborted"
 msgstr "取消檔案傳輸"
 
-#: src/protocols/oscar/oscar.c:866
+#: src/protocols/oscar/oscar.c:864
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:879
+#: src/protocols/oscar/oscar.c:877
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:884
+#: src/protocols/oscar/oscar.c:882
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1064 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1069
+#: src/protocols/oscar/oscar.c:1067
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1073
+#: src/protocols/oscar/oscar.c:1071
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
-#: src/protocols/oscar/oscar.c:1078
+#: src/protocols/oscar/oscar.c:1076
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -5815,17 +5802,17 @@
 "您的連線／斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線，那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1083
+#: src/protocols/oscar/oscar.c:1081
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1115
+#: src/protocols/oscar/oscar.c:1113
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1217 src/protocols/oscar/oscar.c:1247
-#: src/protocols/oscar/oscar.c:1335
+#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
+#: src/protocols/oscar/oscar.c:1333
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5834,29 +5821,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
+#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1336
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入授權碼。"
 
-#: src/protocols/oscar/oscar.c:1918 src/protocols/oscar/oscar.c:5627
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2247 src/protocols/oscar/oscar.c:2269
+#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
 msgid "(There was an error receiving this message)"
 msgstr "（收取這個訊息時發生錯誤）"
 
-#: src/protocols/oscar/oscar.c:2416
+#: src/protocols/oscar/oscar.c:2411
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2419
+#: src/protocols/oscar/oscar.c:2414
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -5865,46 +5852,46 @@
 "這個要求將會在兩部電腦間建立起直接連線，而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址，因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2424 src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2451
+#: src/protocols/oscar/oscar.c:2446
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求，好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2454
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息："
 
-#: src/protocols/oscar/oscar.c:2460
+#: src/protocols/oscar/oscar.c:2455
 msgid "Please authorize me!"
 msgstr "請通過我的認證！"
 
-#: src/protocols/oscar/oscar.c:2488
+#: src/protocols/oscar/oscar.c:2483
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎？"
 
-#: src/protocols/oscar/oscar.c:2493 src/protocols/oscar/oscar.c:2495
+#: src/protocols/oscar/oscar.c:2488 src/protocols/oscar/oscar.c:2490
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2531 src/protocols/oscar/oscar.c:2533
-#: src/protocols/oscar/oscar.c:2540 src/protocols/oscar/oscar.c:2612
-#: src/protocols/oscar/oscar.c:2632 src/protocols/oscar/oscar.c:3007
-#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5145
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
+#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5190
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2539
+#: src/protocols/oscar/oscar.c:2534
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息："
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2607
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5913,11 +5900,11 @@
 "使用者 %u 因為下列原因，想要將您加入他（她）的好友清單中：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:5151
+#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2632
+#: src/protocols/oscar/oscar.c:2627
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -5927,17 +5914,17 @@
 "使用者 %u 因為下列原因，拒絕了您將其加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2633
+#: src/protocols/oscar/oscar.c:2628
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2640
+#: src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2648
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5950,7 +5937,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2656
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5963,7 +5950,7 @@
 "來自：%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2664
+#: src/protocols/oscar/oscar.c:2659
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5979,34 +5966,36 @@
 # XXX 應該把 contact 也統一譯為「好友」嗎？
 # ANS I guess not.
 # NOTE 譯文更動 by Paladin
-#: src/protocols/oscar/oscar.c:2685
+# ANS 這是舊字串，和新的Meta-Contact功能沒有關係
+# NOTE 譯文更動 by Ambrose
+#: src/protocols/oscar/oscar.c:2680
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
-msgstr "ICQ 使用者 %u 送來一個聯絡人資訊：%s (%s)"
-
-#: src/protocols/oscar/oscar.c:2691
+msgstr "ICQ 使用者 %u 送來一個好友資訊：%s (%s)"
+
+#: src/protocols/oscar/oscar.c:2686
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "您想將他（她）加入到您的好友名單中嗎？"
 
-#: src/protocols/oscar/oscar.c:2695
+#: src/protocols/oscar/oscar.c:2690
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:2777
+#: src/protocols/oscar/oscar.c:2772
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們都是無效的。"
 
-#: src/protocols/oscar/oscar.c:2786
+#: src/protocols/oscar/oscar.c:2781
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為它們都太大了。"
 
-#: src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:2790
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6014,112 +6003,112 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為它傳送的速度太快。"
 
-#: src/protocols/oscar/oscar.c:2804
+#: src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他 / 她太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2813
+#: src/protocols/oscar/oscar.c:2808
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:2822
+#: src/protocols/oscar/oscar.c:2817
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您因為不明原因而遺失了 %hu 個由 %s 送來的訊息。"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4613
-#: src/protocols/oscar/oscar.c:5917
+#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:5916
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4607
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
+#: src/protocols/oscar/oscar.c:5914
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:2844 src/protocols/oscar/oscar.c:4610
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
+#: src/protocols/oscar/oscar.c:5915
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2848
+#: src/protocols/oscar/oscar.c:2843
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:2908
+#: src/protocols/oscar/oscar.c:2903
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號：</B> %s<BR><B>狀態：</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2910
+#: src/protocols/oscar/oscar.c:2905
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>狀態：</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2969
+#: src/protocols/oscar/oscar.c:2964
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤：%s\n"
 
-#: src/protocols/oscar/oscar.c:2970
+#: src/protocols/oscar/oscar.c:2965
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3000
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出："
 
-#: src/protocols/oscar/oscar.c:3057
+#: src/protocols/oscar/oscar.c:3052
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "使用者 %s 的個人資訊並不存在："
 
-#: src/protocols/oscar/oscar.c:3094
+#: src/protocols/oscar/oscar.c:3089
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5946
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:3103 src/protocols/oscar/oscar.c:5962
+#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:3106 src/protocols/oscar/oscar.c:5954
+#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3105
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3108
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3111
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3114
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy 錯誤"
 
-#: src/protocols/oscar/oscar.c:3122
+#: src/protocols/oscar/oscar.c:3117
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:3125
+#: src/protocols/oscar/oscar.c:3120
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6130,61 +6119,61 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:3128
+#: src/protocols/oscar/oscar.c:3123
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3131
+#: src/protocols/oscar/oscar.c:3126
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:3134
+#: src/protocols/oscar/oscar.c:3129
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3137
+#: src/protocols/oscar/oscar.c:3132
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:3140
+#: src/protocols/oscar/oscar.c:3135
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:3143
+#: src/protocols/oscar/oscar.c:3138
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3146
+#: src/protocols/oscar/oscar.c:3141
 msgid "Secure IM"
 msgstr "加密即時訊息"
 
-#: src/protocols/oscar/oscar.c:3186
+#: src/protocols/oscar/oscar.c:3181
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<I>因為使用了未知的編碼，所以無法顯示訊息。</i>"
 
-#: src/protocols/oscar/oscar.c:3193
+#: src/protocols/oscar/oscar.c:3188
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "上線時間：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3193
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "成為成員的時間：<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3204
+#: src/protocols/oscar/oscar.c:3199
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "閒置：<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3207
+#: src/protocols/oscar/oscar.c:3202
 msgid "Idle: <b>Active</b>"
 msgstr "閒置：<b>沒閒置</b>"
 
-#: src/protocols/oscar/oscar.c:3209
+#: src/protocols/oscar/oscar.c:3204
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -6197,27 +6186,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3241
+#: src/protocols/oscar/oscar.c:3236
 msgid "<i>User has no away message</i>"
 msgstr "<i>使用者沒有離開訊息</i>"
 
-#: src/protocols/oscar/oscar.c:3252
+#: src/protocols/oscar/oscar.c:3247
 msgid "Client Capabilities: "
 msgstr "客戶端相容性："
 
-#: src/protocols/oscar/oscar.c:3258
+#: src/protocols/oscar/oscar.c:3253
 msgid "<i>No Information Provided</i>"
 msgstr "<i>未提供任何信息</i>"
 
-#: src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:3277
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
-#: src/protocols/oscar/oscar.c:3670
+#: src/protocols/oscar/oscar.c:3665
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3671
+#: src/protocols/oscar/oscar.c:3666
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6225,133 +6214,133 @@
 "您最近做的一個動作無法完成，因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3727
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線，因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3734
+#: src/protocols/oscar/oscar.c:3729
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:3986
+#: src/protocols/oscar/oscar.c:3985
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
 #: src/protocols/trepia/trepia.c:454
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:3989 src/protocols/trepia/trepia.c:312
+#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
 #: src/protocols/trepia/trepia.c:454
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:4005
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4008
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4013
+#: src/protocols/oscar/oscar.c:4012
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4015 src/protocols/oscar/oscar.c:4031
+#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/oscar/oscar.c:4024 src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4029
+#: src/protocols/oscar/oscar.c:4028
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4045
+#: src/protocols/oscar/oscar.c:4044
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4047
+#: src/protocols/oscar/oscar.c:4046
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4050
+#: src/protocols/oscar/oscar.c:4049
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4053
+#: src/protocols/oscar/oscar.c:4052
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4056
+#: src/protocols/oscar/oscar.c:4055
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4062
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 可能譯錯
-#: src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:4127
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "下列帳號與 %s 有關"
 
-#: src/protocols/oscar/oscar.c:4132
+#: src/protocols/oscar/oscar.c:4131
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4149
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4169
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4172
+#: src/protocols/oscar/oscar.c:4171
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4199
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4203
+#: src/protocols/oscar/oscar.c:4202
 #, 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:4206
+#: src/protocols/oscar/oscar.c:4205
 #, 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:4209
+#: src/protocols/oscar/oscar.c:4208
 #, 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:4212
+#: src/protocols/oscar/oscar.c:4211
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6359,7 +6348,7 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4215
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6367,19 +6356,19 @@
 msgstr ""
 "錯誤 0x%04x：無法改變電子郵件地址，因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4217
 #, 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:4221
+#: src/protocols/oscar/oscar.c:4220
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x：未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4231
+#: src/protocols/oscar/oscar.c:4230
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6388,20 +6377,20 @@
 "您的帳號目前被格式化如下：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4232 src/protocols/oscar/oscar.c:4239
+#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4236
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4471
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:4472
 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 "
@@ -6410,7 +6399,7 @@
 "您在未登入完成前要求修改您的個人資訊，所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4503
+#: src/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6420,15 +6409,15 @@
 "truncated it for you."
 msgstr[0] "超出個人資訊的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
+#: src/protocols/oscar/oscar.c:4526
+msgid "Unable to set AIM away message."
+msgstr "無法設定 AIM 離開訊息。"
+
 #: src/protocols/oscar/oscar.c:4527
-msgid "Unable to set AIM away message."
-msgstr "無法設定 AIM 離開訊息。"
-
-#: src/protocols/oscar/oscar.c:4528
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6437,7 +6426,7 @@
 "您試著在登入程序完成前修改您的離開訊息，您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4567
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6447,15 +6436,15 @@
 "truncated it for you."
 msgstr[0] "超出離開訊息的長度上限 %d 位元組。Gaim 將在截短內容後進行設定。"
 
-#: src/protocols/oscar/oscar.c:4573
+#: src/protocols/oscar/oscar.c:4572
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
+#: src/protocols/oscar/oscar.c:4792
+msgid "Unable To Retrieve Buddy List"
+msgstr "無法讀取好友清單"
+
 #: src/protocols/oscar/oscar.c:4793
-msgid "Unable To Retrieve Buddy List"
-msgstr "無法讀取好友清單"
-
-#: src/protocols/oscar/oscar.c:4794
 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 "
@@ -6464,12 +6453,12 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失，可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:4885 src/protocols/oscar/oscar.c:4886
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
+#: src/protocols/oscar/oscar.c:4890
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6478,15 +6467,15 @@
 "因為您的好友法單中有太多的好友，所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6496,7 +6485,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5105
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6506,11 +6495,11 @@
 "呢？"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5111
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5145
+#: src/protocols/oscar/oscar.c:5144
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6520,18 +6509,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5186
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "使用者 %s 允許了您將他（她）加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:5188
+#: src/protocols/oscar/oscar.c:5187
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5190
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -6541,91 +6530,91 @@
 "使用者 %s 因為下列原因，拒絕了您將他（她）加入好友清單的要求：\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5192
+#: src/protocols/oscar/oscar.c:5191
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-#: src/protocols/oscar/oscar.c:5229 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
 msgid "Exchange:"
 msgstr "聊天室號碼："
 
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/oscar/oscar.c:5450
 msgid "<b>Status:</b> "
 msgstr "<b>狀態：</b>"
 
-#: src/protocols/oscar/oscar.c:5460
+#: src/protocols/oscar/oscar.c:5459
 msgid "<b>Logged In:</b> "
 msgstr "<b>登入時間：</b>"
 
-#: src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:5470
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 位址：</b>"
 
-#: src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:5478
 msgid "<b>Capabilities:</b> "
 msgstr "<b>相容性：</b>"
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>Available:</b> "
 msgstr "<b>上線：</b>"
 
-#: src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:5494
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>狀態：</b>未認證"
 
-#: src/protocols/oscar/oscar.c:5529 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/oscar/oscar.c:5770
+#: src/protocols/oscar/oscar.c:5769
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:5783
+#: src/protocols/oscar/oscar.c:5782
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:5785
 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:5931
+#: src/protocols/oscar/oscar.c:5930
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-#: src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5974
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:5995
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5996
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6003
+#: src/protocols/oscar/oscar.c:6002
 msgid "New screenname formatting:"
 msgstr "新的帳號格式："
 
-#: src/protocols/oscar/oscar.c:6052
+#: src/protocols/oscar/oscar.c:6051
 msgid "Change Address To:"
 msgstr "變更地址為："
 
-#: src/protocols/oscar/oscar.c:6096
+#: src/protocols/oscar/oscar.c:6095
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
+#: src/protocols/oscar/oscar.c:6098
+msgid "You are awaiting authorization from the following buddies"
+msgstr "您目前正在等待下列好友的認證"
+
 #: src/protocols/oscar/oscar.c:6099
-msgid "You are awaiting authorization from the following buddies"
-msgstr "您目前正在等待下列好友的認證"
-
-#: src/protocols/oscar/oscar.c:6100
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6633,43 +6622,43 @@
 "您可以重新要求這些好友的認證，只要在好友清單中以滑鼠右鍵點擊他們，然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6116
+#: src/protocols/oscar/oscar.c:6115
 msgid "Available Message:"
 msgstr "上線訊息："
 
-#: src/protocols/oscar/oscar.c:6117
+#: src/protocols/oscar/oscar.c:6116
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "請和我聊聊吧！我覺得好寂寞！"
 
-#: src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:6178
 msgid "Set Available Message"
 msgstr "設定上線訊息"
 
-#: src/protocols/oscar/oscar.c:6193
+#: src/protocols/oscar/oscar.c:6192
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6204
+#: src/protocols/oscar/oscar.c:6203
 msgid "Format Screenname"
 msgstr "格式化帳號"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6209
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6216
+#: src/protocols/oscar/oscar.c:6215
 msgid "Display Current Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6222
+#: src/protocols/oscar/oscar.c:6221
 msgid "Change Current Registered Address"
 msgstr "修改目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6231
+#: src/protocols/oscar/oscar.c:6230
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6239
+#: src/protocols/oscar/oscar.c:6238
 msgid "Search for Buddy by Email"
 msgstr "使用電子郵件地址搜尋好友"
 
@@ -6683,15 +6672,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6360 src/protocols/oscar/oscar.c:6362
+#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:6379
+#: src/protocols/oscar/oscar.c:6378
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:6384
+#: src/protocols/oscar/oscar.c:6383
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -7020,8 +7009,8 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的"
-"要求：%s"
+"使用者 %s 因為下列原因，剛剛拒絕了您先前將他（她）新增至您的好友清單的要求：%"
+"s"
 
 #: src/protocols/yahoo/yahoo.c:755
 msgid "Add buddy rejected"
@@ -7266,21 +7255,21 @@
 msgstr "因為 Zephyr 用您登入系統的帳號，您是不可能擁有多個 Zephyr 帳戶的。"
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 ZLocate 是一種名錄服務，不過在這裡不知是什麼意思
-#: src/protocols/zephyr/zephyr.c:854
+#: src/protocols/zephyr/zephyr.c:855
 msgid "ZLocate"
 msgstr ""
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 Class 不是類別，而是一種半私人的聊天室
-#: src/protocols/zephyr/zephyr.c:894
+#: src/protocols/zephyr/zephyr.c:895
 msgid "Class:"
 msgstr ""
 
 # TODO: 在 Google 找到的資料說 Zephyr 的 Instance 是一種公共的聊天室
-#: src/protocols/zephyr/zephyr.c:899
+#: src/protocols/zephyr/zephyr.c:900
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:904
+#: src/protocols/zephyr/zephyr.c:905
 msgid "Recipient:"
 msgstr "接受者："
 
@@ -7294,7 +7283,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1036 src/protocols/zephyr/zephyr.c:1038
+#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -7445,6 +7434,16 @@
 msgid "Unknown."
 msgstr "未知。"
 
+# TODO need to check context
+#: src/win32/win32dep.c:474
+msgid "Notification"
+msgstr "通知"
+
+# XXX 要複查譯文
+#: src/win32/win32dep.c:475
+msgid "Moving Gaim user settings directory to:"
+msgstr "包含 Gaim 的使用者設定的目錄現在移至："
+
 #~ msgid "There was an error launching your chosen browser: %s"
 #~ msgstr "啟動您所選擇的瀏覽器時發生錯誤：%s"
 
@@ -7754,4 +7753,4 @@
 #~ "並沒有提供登入的功能。"
 
 #~ msgid "Account Editor"
-#~ msgstr "帳號清單"
\ No newline at end of file
+#~ msgstr "帳號清單"