changeset 8970:c9c54c17a9dd

[gaim-migrate @ 9744] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 19 May 2004 00:44:41 +0000
parents e5c6d334b885
children f831a38eb6ba
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 2691 insertions(+), 1493 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue May 18 19:13:30 2004 +0000
+++ b/po/ChangeLog	Wed May 19 00:44:41 2004 +0000
@@ -2,6 +2,7 @@
 
 version 0.78cvs:
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (Miloslav Trmac)
 	* English (Canadian) translation added (Adam Weinberger)
 	* Slovenian translation added (Matjaz Horvat)
--- a/po/zh_TW.po	Tue May 18 19:13:30 2004 +0000
+++ b/po/zh_TW.po	Wed May 19 00:44:41 2004 +0000
@@ -12,6 +12,23 @@
 # XXX   表示可能有問題,要複查;有問題需討論
 # ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
 # ----------------------------------------------------------
+# SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
+# - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
+# - Public Key 暫譯「公鑰」
+# - Private Key 暫譯「私鑰」
+# - Key Pair 暫無譯文 (TODO)
+# - Key Agreement 與 Key Exchange 似乎同義,譯「交換密鑰」
+# - Passphrase 譯「密碼」
+# (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
+# 另有 SILC 術語:
+# - Private Group 係聊天室內的一種小圈子,譯無可譯之下,暫譯「小圈子」 (XXX)
+# - KE Group 即 Key Exchange Group, 暫譯「密鑰交換群組」,有可能是誤譯 (TODO)
+# - Kill 意為 Remove client from network, 暫直譯「從網路上移除」 (XXX)
+# - Detach 意即跟伺服器停止連線,但不登出,暫譯「暫停連線」
+#   - Detach 的相反詞 Resume 暫譯「恢復連線」
+# - Watch 暫時意譯「伺服器端的好友狀態捕捉」
+# - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
+#
 # FIXME 未有統一譯法的字詞:Buddy List, Postal code、Profile、match、connect、user info
 # FIXME「such」應為「斯」,即「這個」,但目前譯文沒有統一
 # NOTE  中文統一用「」引號;URL、指令等該用 '/" 者除外
@@ -23,11 +40,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.77\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 22:29-0400\n"
+"Project-Id-Version: Gaim 0.78\n"
+"POT-Creation-Date: 2004-05-17 16:06-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,6 +51,18 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+#: plugins/autorecon.c:174
+msgid "Error Message Suppression"
+msgstr "錯誤訊息抑遏"
+
+#: plugins/autorecon.c:178
+msgid "Hide Disconnect Errors"
+msgstr "不顯示中斷連線錯誤"
+
+#: plugins/autorecon.c:182
+msgid "Hide Login Errors"
+msgstr "不顯示登入錯誤"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -56,15 +84,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:110
+#: plugins/autorecon.c:204
 msgid "Auto-Reconnect"
 msgstr "自動重新連線"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
@@ -186,19 +213,21 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1637 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1568 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2262 src/protocols/novell/novell.c:2314
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:5808 src/protocols/oscar/oscar.c:6426
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2715
+#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2884
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4833
+#: src/protocols/oscar/oscar.c:5815 src/protocols/oscar/oscar.c:6431
+#: src/protocols/silc/buddy.c:1360 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "離開"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6434
+#: plugins/docklet/docklet.c:159 src/away.c:550
+#: src/protocols/oscar/oscar.c:4751 src/protocols/oscar/oscar.c:6439
 msgid "Back"
 msgstr "返回"
 
@@ -210,12 +239,11 @@
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2594 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2520
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -280,7 +308,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允許您在檔案中輸入指令以控制 Gaim。"
@@ -437,16 +464,16 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2964 src/gtkprefs.c:884 src/gtkprefs.c:1665
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2996 src/gtkprefs.c:862 src/gtkprefs.c:976
+#: src/gtkprefs.c:1018 src/gtkprefs.c:1581 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2006
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1928
+#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1365 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
 
@@ -464,13 +491,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6697
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6704
 msgid "Search"
 msgstr "搜尋"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
-#: src/gtkblist.c:4310
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
+#: src/gtkblist.c:4339
 msgid "Group:"
 msgstr "群組:"
 
@@ -514,8 +541,8 @@
 msgstr "聯結好友 (_A)"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3836
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "好友"
 
@@ -558,7 +585,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供和 Ximian Evolution 的整合。"
@@ -603,15 +629,15 @@
 msgid "E-mail:"
 msgstr "電子郵件:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "歷史記錄"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -631,7 +657,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
@@ -814,7 +839,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/notify.c:765 plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
@@ -832,7 +856,6 @@
 
 #. *< name
 #. *< version
-#. *< summary
 #: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
@@ -930,7 +953,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/signals-test.c:468 plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
@@ -949,7 +971,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
@@ -1000,7 +1021,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
@@ -1019,7 +1039,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
@@ -1038,12 +1057,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30 src/gtkpounce.c:910
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 已經離開。"
@@ -1077,7 +1095,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1106,7 +1123,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
@@ -1137,36 +1153,35 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:176 plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "不透明度:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "即時訊息交談視窗"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "即時訊息視窗透明度(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:887
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:856
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "好友清單視窗透明度(_B)"
 
@@ -1177,22 +1192,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "透明度"
 
 #. *< name
 #. *< version
 #. *  summary
+#: plugins/win32/transparency/win2ktrans.c:466
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "交談視窗及好友清單產生的半透明效果。"
+
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:425
-#: plugins/win32/transparency/win2ktrans.c:427
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows.\n"
+#: plugins/win32/transparency/win2ktrans.c:468
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 msgstr ""
-"這個模組可以讓交談視窗產生半透明的效果。\n"
+"這個模組可以讓交談視窗及好友清單產生半透明的效果。\n"
 "\n"
 "* 請注意:這個模組需要 Win2000 或 WinXP 才能產生效果。"
 
@@ -1210,8 +1229,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3005
-#: src/gtkprefs.c:2505
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3037
+#: src/gtkprefs.c:2427
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1230,8 +1249,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:925
-#: src/gtkprefs.c:2506 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:897
+#: src/gtkprefs.c:2428 src/protocols/msn/msn.c:1607
 msgid "Conversations"
 msgstr "交談"
 
@@ -1309,274 +1328,308 @@
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:144
+#: src/about.c:145
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:149
+#: src/about.c:150
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:154
+#: src/about.c:155
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:162
+#: src/about.c:163
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:163 src/about.c:197
+#: src/about.c:164 src/about.c:201
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:165 src/about.c:202
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:165
+#: src/about.c:166
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:168
+msgid "Canadian English"
+msgstr "加拿大式英文"
+
+#: src/about.c:169 src/about.c:203
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:170 src/about.c:204
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:171 src/about.c:205
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:172 src/about.c:206
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:171
+#: src/about.c:173
+msgid "Hebrew"
+msgstr "希伯來文"
+
+#: src/about.c:174
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:172
+#: src/about.c:175
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-# NOTE 香港譯「意大利文」,但這是 zh-TW :-)
-#: src/about.c:173 src/about.c:204
+#  NOTE 港譯「意大利」,臺譯「義大利」。「意」為陰去聲,「義」為陽去聲;
+#  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
+#  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
+#  NOTE【參見「Slovenian」】
+#: src/about.c:176 src/about.c:207
 msgid "Italian"
-msgstr "義大利文"
-
-#: src/about.c:174 src/about.c:206
+msgstr "意大利文"
+
+#: src/about.c:177 src/about.c:209
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:175
+#: src/about.c:178
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: src/about.c:176
+#  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
+#: src/about.c:179
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:177
+#: src/about.c:180
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:181 src/about.c:210
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:179
+#: src/about.c:182
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:180
+#: src/about.c:183
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:181
+#: src/about.c:184
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:185 src/about.c:211
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:183
+#: src/about.c:186
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
-#: src/about.c:184 src/about.c:210
+#  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
+#  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
+#  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
+#  NOTE【參見「Italian」】
+#: src/about.c:187
+msgid "Slovenian"
+msgstr "斯洛維尼亞文"
+
+#: src/about.c:188 src/about.c:213
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:185
+#: src/about.c:189
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:185
+#: src/about.c:189
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:186
+#: src/about.c:190
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:187
+#: src/about.c:191
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:194
+#: src/about.c:198
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:195
+#: src/about.c:199
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:196
+#: src/about.c:200
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:203
-msgid "Hebrew"
-msgstr "希伯來文"
-
-#: src/about.c:205
+#: src/about.c:208
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:209
+#: src/about.c:212
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:211
+#: src/about.c:214
 msgid "Chinese"
 msgstr "中文"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:278 src/protocols/jabber/jabber.c:998
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: src/account.c:288
+#: src/account.c:287
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: src/account.c:313
+#: src/account.c:312
 msgid "Original password"
 msgstr "舊密碼"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password"
 msgstr "新密碼"
 
-#: src/account.c:327
+#: src/account.c:326
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/account.c:333
+#: src/account.c:332
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:341
+#: src/account.c:340
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:6487
-#: src/protocols/oscar/oscar.c:6583 src/protocols/oscar/oscar.c:6632
-#: src/protocols/oscar/oscar.c:6714 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:343 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
+#: src/dialogs.c:581 src/gtkblist.c:2391 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:191 src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:213 src/protocols/msn/msn.c:224
+#: src/protocols/oscar/oscar.c:2759 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6588
+#: src/protocols/oscar/oscar.c:6637 src/protocols/oscar/oscar.c:6721
+#: src/protocols/silc/buddy.c:447 src/protocols/silc/buddy.c:1087
+#: src/protocols/silc/chat.c:657 src/protocols/silc/ops.c:978
+#: src/protocols/silc/ops.c:1389 src/protocols/silc/silc.c:687
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
+#: src/request.h:1242
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2722
-#: src/protocols/oscar/oscar.c:2761 src/protocols/oscar/oscar.c:2797
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:6305
-#: src/protocols/oscar/oscar.c:6488 src/protocols/oscar/oscar.c:6584
-#: src/protocols/oscar/oscar.c:6633 src/protocols/oscar/oscar.c:6698
-#: src/protocols/oscar/oscar.c:6715 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
+#: src/dialogs.c:306 src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352
+#: src/dialogs.c:473 src/dialogs.c:529 src/dialogs.c:582 src/dialogs.c:907
+#: src/dialogs.c:929 src/dialogs.c:946 src/dialogs.c:965 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2392 src/gtkblist.c:4378
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
+#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:2760
+#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2841
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6493
+#: src/protocols/oscar/oscar.c:6589 src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6722
+#: src/protocols/silc/buddy.c:448 src/protocols/silc/buddy.c:992
+#: src/protocols/silc/buddy.c:1088 src/protocols/silc/chat.c:658
+#: src/protocols/silc/ops.c:1390 src/protocols/silc/silc.c:688
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2513 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:374
+#: src/account.c:373
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
+#: src/account.c:381 src/dialogs.c:895 src/gtkrequest.c:242
 #: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
-#: src/away.c:210
+#: src/away.c:211
 msgid "Away!"
 msgstr "離開!"
 
-#: src/away.c:275
+#: src/away.c:276
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:375
+#: src/away.c:330
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "您確定要移除離開訊息「%s」?"
+
+#: src/away.c:332 src/away.c:423
+msgid "Remove Away Message"
+msgstr "移除離開訊息"
+
+#. Remove button
+#: src/away.c:333 src/gtkconv.c:1145 src/gtkconv.c:3329 src/gtkconv.c:3428
+#: src/gtkrequest.c:241
+msgid "Remove"
+msgstr "移除"
+
+#: src/away.c:403
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:395
-msgid "Remove Away Message"
-msgstr "移除離開訊息"
-
-#: src/away.c:590
+#: src/away.c:618
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:590 src/gtkprefs.c:2508
+#: src/blist.c:590 src/gtkprefs.c:2430
 msgid "Chats"
 msgstr "聊天"
 
@@ -1599,21 +1652,23 @@
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2159
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2727
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
-msgstr "在解析您的好友清單時發生錯誤。好友清單沒有被讀入。"
-
-#: src/blist.c:2222
+#: src/blist.c:2236
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"在解析您的好友清單時發生錯誤。好友清單沒有被讀入,舊檔已移至blist.xml~。"
+
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1635,11 +1690,11 @@
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
 
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1648,7 +1703,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1969
+#: src/conversation.c:1954
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1658,62 +1713,62 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1972
+#: src/conversation.c:1957
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2097
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2185
+#: src/conversation.c:2170
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2172
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2467
+#: src/conversation.c:2452
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1413
+#: src/conversation.c:2454 src/gtkprefs.c:1356
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2456
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2458
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:154
+#: src/dialogs.c:155
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:174
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1725,37 +1780,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:183
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:190
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:301
+#: src/dialogs.c:302
 #, 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:303 src/dialogs.c:304
+#: src/dialogs.c:304 src/dialogs.c:305
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:314
 #, 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:315 src/dialogs.c:316
+#: src/dialogs.c:316 src/dialogs.c:317
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:326
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1763,11 +1818,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:329 src/dialogs.c:330
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1777,104 +1832,115 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:454 src/dialogs.c:510 src/dialogs.c:562
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:460 src/dialogs.c:516 src/dialogs.c:568
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:467
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:469
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:523
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:524
+#: src/dialogs.c:525
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
+#  NOTE 此處譯「讀取」似乎較「取得」好一點
+#: src/dialogs.c:576
+msgid "Get User Log"
+msgstr "讀取使用者日誌"
+
+#: src/dialogs.c:578
+msgid ""
+"Please enter the screen name of the person whose log you would like to view."
+msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
+
+#: src/dialogs.c:606 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
+#: src/dialogs.c:634 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
+#: src/dialogs.c:673 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/dialogs.c:692
+#: src/dialogs.c:746
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:748
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:758
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:820
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:841
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:843
+#: src/dialogs.c:899
 msgid "Save & Use"
 msgstr "儲存並使用"
 
-#: src/dialogs.c:847
+#: src/dialogs.c:903
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:868
+#: src/dialogs.c:925
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:869
+#: src/dialogs.c:926
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:928 src/dialogs.c:945 src/dialogs.c:964 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:545
 msgid "Alias"
 msgstr "別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:885
+#: src/dialogs.c:942
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:886
+#: src/dialogs.c:943
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:960
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:905
+#: src/dialogs.c:962
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
@@ -1985,19 +2051,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:374 src/gaimrc.c:1405
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1215 src/gtkblist.c:2998
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1217 src/gtkblist.c:2999
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1219 src/gtkblist.c:3000
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -2021,7 +2087,7 @@
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406 src/gtkblist.c:3983
 msgid "Screen Name:"
 msgstr "帳號:"
 
@@ -2029,7 +2095,7 @@
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484 src/gtkblist.c:3997 src/gtkblist.c:4325
 msgid "Alias:"
 msgstr "別名:"
 
@@ -2092,7 +2158,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1214
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1157
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -2108,15 +2174,15 @@
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1208
+#: src/gtkaccount.c:937 src/gtkprefs.c:1151
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1238
+#: src/gtkaccount.c:946 src/gtkprefs.c:1181
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1256
+#: src/gtkaccount.c:950 src/gtkprefs.c:1199
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
@@ -2124,7 +2190,7 @@
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1293
+#: src/gtkaccount.c:963 src/gtkprefs.c:1236
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
@@ -2136,17 +2202,18 @@
 msgid "Modify Account"
 msgstr "修改帳號"
 
+#  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
 #: src/gtkaccount.c:1357
 msgid "Show more options"
-msgstr "顯示較多的選項"
+msgstr "顯示細節"
 
 #: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr "顯示較少的選項"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
 msgid "Register"
 msgstr "註冊"
 
@@ -2159,14 +2226,15 @@
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3365
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3364
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4823
-#: src/protocols/oscar/oscar.c:6425 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4831
+#: src/protocols/oscar/oscar.c:6430 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1183
+#: src/protocols/zephyr/zephyr.c:1193
 msgid "Online"
 msgstr "上線"
 
@@ -2198,215 +2266,214 @@
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3423 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3004
+#: src/gtkaccount.c:2234 src/gtkblist.c:4377 src/gtkconv.c:1147
+#: src/gtkconv.c:3322 src/gtkconv.c:3421 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3003
 msgid "Add"
 msgstr "加入"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
-
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:814
+#: src/gtkblist.c:811
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:832
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:843 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1082 src/gtkblist.c:3187
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1085 src/gtkblist.c:3178
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1087
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1089
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1154 src/gtkblist.c:1283 src/gtkblist.c:1297
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1156 src/gtkblist.c:1285 src/gtkblist.c:1302
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1204
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1206
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1208
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1210
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1261 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1263
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1299 src/gtkblist.c:1325
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1330
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1964 src/gtkconv.c:3911
+#: src/gtkblist.c:1988 src/gtkconv.c:3942 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2312
+#: src/gtkblist.c:2339
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2340
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2341
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2342
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
-#: src/gtkblist.c:2317
+#  NOTE 此處譯「讀取」似乎較「取得」好一點
+#: src/gtkblist.c:2343
+msgid "/Buddies/View User _Log..."
+msgstr "/好友/讀取使用者日誌(_L)..."
+
+#: src/gtkblist.c:2345
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2346
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2347
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2348
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2349
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2351
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2352
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2355
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2356
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2357
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:2330
-msgid "/Tools/P_rotocol Actions"
-msgstr "/工具/通訊協定相關設定(_R)"
-
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2358
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具/帳號相關指令(_T)"
+
+#: src/gtkblist.c:2360
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2361
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2362
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2363
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2364
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2366
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2369
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2370
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2371
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2372
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2388
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2389
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2417
 #, c-format
 msgid ""
 "\n"
@@ -2415,16 +2482,20 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2453
-msgid "<b>Status:</b> Offline"
-msgstr "<b>狀態:</b>離線"
-
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2481
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>狀態:</b>離線"
+
+#: src/gtkblist.c:2496
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2512
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2432,7 +2503,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2513
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2440,7 +2511,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2514
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2448,7 +2519,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2515
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2456,7 +2527,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2464,7 +2535,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2517
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2472,7 +2543,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2518
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2480,7 +2551,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2488,7 +2559,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2521
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2496,7 +2567,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2522
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2504,77 +2575,92 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2764
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2766
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2771
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2774
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "離線"
 
-#: src/gtkblist.c:3032
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2921
+msgid "/Buddies/Join a Chat..."
+msgstr "/好友/加入聊天室(_C)..."
+
+#: src/gtkblist.c:2924
+msgid "/Tools/Room List"
+msgstr "/工具/聊天室清單"
+
+#: src/gtkblist.c:2927
+msgid "/Tools/Privacy"
+msgstr "/工具/隱私設定"
+
+#: src/gtkblist.c:3064
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3067
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3038
-msgid "/Tools/Protocol Actions"
-msgstr "/工具/通訊協定相關設定"
+#: src/gtkblist.c:3070
+msgid "/Tools/Account Actions"
+msgstr "/工具/帳號相關指令"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3158
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3128
+#: src/gtkblist.c:3160
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3152
+#: src/gtkblist.c:3184
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3193
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3164
+#: src/gtkblist.c:3196
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3201
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3204
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3177
+#: src/gtkblist.c:3209
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3938 src/protocols/silc/buddy.c:686
+#: src/protocols/silc/buddy.c:944 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/buddy.c:1079 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3932
+#: src/gtkblist.c:3961
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2584,29 +2670,35 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:4021 src/gtkblist.c:4305
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4243
+#: src/gtkblist.c:4265
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
+
+#: src/gtkblist.c:4272
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4266
+#: src/gtkblist.c:4295
 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:4345
+#: src/gtkblist.c:4374
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4346
+#: src/gtkblist.c:4375
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4866
+#: src/gtkblist.c:4919
 msgid "No actions available"
 msgstr "不允許任何動作"
 
@@ -2661,332 +2753,331 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:191 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:539
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:533
+#: src/gtkconv.c:567
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:588
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:608
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:701 src/gtkdebug.c:127
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:727 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1105
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1113
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:817
+#: src/gtkconv.c:1115
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1124 src/gtkconv.c:3336
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1133
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#. Remove button
-#: src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3430
-#: src/gtkrequest.c:241
-msgid "Remove"
-msgstr "移除"
-
-#: src/gtkconv.c:2201
+#: src/gtkconv.c:2233
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2206
+#: src/gtkconv.c:2238
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2212
+#: src/gtkconv.c:2244
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2579
+#: src/gtkconv.c:2611
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2587
+#: src/gtkconv.c:2619
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2722
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3099
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3116
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3129
+#: src/gtkconv.c:3118
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3123
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3125
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3126
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3131
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3133
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3135
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3137
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3142
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3144
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3157
+#: src/gtkconv.c:3146
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3148
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3153
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3155
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3164
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3165
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3166
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3167
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
+#: src/gtkconv.c:3209
+msgid "/Conversation/View Log"
+msgstr "/交談/觀看歷史記錄"
+
+#: src/gtkconv.c:3214
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/交談/新增好友狀態捕捉..."
+
 #: src/gtkconv.c:3220
-msgid "/Conversation/View Log"
-msgstr "/交談/觀看歷史記錄"
-
-#: src/gtkconv.c:3225
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/交談/新增好友狀態捕捉..."
-
-#: src/gtkconv.c:3231
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3235
+#: src/gtkconv.c:3224
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3228
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3234
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3238
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3242
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3257
+#: src/gtkconv.c:3246
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3252
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3256
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3273
+#: src/gtkconv.c:3262
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3276
+#: src/gtkconv.c:3265
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3279
+#: src/gtkconv.c:3268
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3402 src/gtkconv.c:3404
+#: src/gtkconv.c:3292 src/gtkconv.c:3294 src/gtkconv.c:3400 src/gtkconv.c:3402
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3308
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3311
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3315 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3318
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3325
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3332
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3671
+#: src/gtkconv.c:3339 src/gtkconv.c:3683
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3416
+#: src/gtkconv.c:3414
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3419
+#: src/gtkconv.c:3417
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3426
+#: src/gtkconv.c:3424
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3431
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3533
+#: src/gtkconv.c:3541
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3605
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3648
-msgid "IM the user"
-msgstr "送出即時訊息給使用者"
-
 #: src/gtkconv.c:3660
+msgid "IM the user"
+msgstr "送出即時訊息給使用者"
+
+#: src/gtkconv.c:3672
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4202
+#: src/gtkconv.c:4233
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4747 src/gtkconv.c:4779 src/gtkconv.c:4900 src/gtkconv.c:4967
+#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5484 src/gtkconv.c:5487
+#: src/gtkconv.c:5507 src/gtkconv.c:5510
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkdebug.c:135
+#  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "儲存除錯紀錄"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "時間戳記"
 
@@ -3100,7 +3191,8 @@
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
-#: src/gtkft.c:1131
+#. Open file selector to select the public key.
+#: src/gtkft.c:1131 src/protocols/silc/buddy.c:978
 msgid "Open..."
 msgstr "開啟..."
 
@@ -3131,35 +3223,40 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: src/gtkimhtml.c:1139
+#  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "貼上純文字(_S)"
+
+#: src/gtkimhtml.c:1200
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:1151
+#: src/gtkimhtml.c:1212
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:1161
+#: src/gtkimhtml.c:1222
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2643
+#: src/gtkimhtml.c:2651
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2659
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2660
+#: src/gtkimhtml.c:2668
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2683
+#: src/gtkimhtml.c:2691
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3185,61 +3282,66 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:457
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:483
 msgid "Insert Image"
 msgstr "插入影像"
 
+#  XXX 譯文不通順
+#: src/gtkimhtmltoolbar.c:618
+msgid "This theme has no available smileys."
+msgstr "這個表情主題不含任何表情。"
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:633
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:825
+#: src/gtkimhtmltoolbar.c:851
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:836
+#: src/gtkimhtmltoolbar.c:862
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:847
+#: src/gtkimhtmltoolbar.c:873
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:863
+#: src/gtkimhtmltoolbar.c:889
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:875
+#: src/gtkimhtmltoolbar.c:901
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:892
+#: src/gtkimhtmltoolbar.c:918
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:904
+#: src/gtkimhtmltoolbar.c:930
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:942
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:931
+#: src/gtkimhtmltoolbar.c:957
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:941
+#: src/gtkimhtmltoolbar.c:967
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:952
+#: src/gtkimhtmltoolbar.c:978
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -3261,17 +3363,17 @@
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3282,7 +3384,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3293,183 +3395,183 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:419
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
+#: src/gtknotify.c:559
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:433 src/gtknotify.c:448
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:560
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtkpounce.c:143
+#: src/gtkpounce.c:144
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:192
+#: src/gtkpounce.c:193
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:406 src/gtkpounce.c:846
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:336
+#: src/gtkpounce.c:406
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:354
+#: src/gtkpounce.c:424
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:381
-msgid "_Buddy Name:"
+#: src/gtkpounce.c:451
+msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:475
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:412
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "登入(_S)"
 
-#: src/gtkpounce.c:414
+#: src/gtkpounce.c:485
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:416
+#: src/gtkpounce.c:487
 msgid "A_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:418
+#: src/gtkpounce.c:489
 msgid "Re_turn from away"
 msgstr "由離開返回(_T)"
 
-#: src/gtkpounce.c:420
+#: src/gtkpounce.c:491
 msgid "_Idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:422
+#: src/gtkpounce.c:493
 msgid "Retur_n from idle"
 msgstr "由閒置返回(_N)"
 
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:495
 msgid "Buddy starts _typing"
 msgstr "好友開始輸入(_T)"
 
-#: src/gtkpounce.c:426
+#: src/gtkpounce.c:497
 msgid "Buddy stops t_yping"
 msgstr "好友停止輸入(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:526
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:533
 msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗(_E)"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:534
 msgid "_Popup notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:535
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:536
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:537
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:541
 msgid "B_rowse..."
 msgstr "瀏覽(_R)..."
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:543
 msgid "Bro_wse..."
 msgstr "瀏覽(_W)..."
 
-#: src/gtkpounce.c:473
+#: src/gtkpounce.c:544
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:556
+#: src/gtkpounce.c:627
 msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:763
+#: src/gtkpounce.c:853
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:813
+#: src/gtkpounce.c:903
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 開始輸入訊息給您"
 
-#: src/gtkpounce.c:814
+#: src/gtkpounce.c:904
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 已經登入"
 
-#: src/gtkpounce.c:815
+#: src/gtkpounce.c:905
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s 由閒置返回"
 
-#: src/gtkpounce.c:816
+#: src/gtkpounce.c:906
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s 由離開返回"
 
-#: src/gtkpounce.c:817
+#: src/gtkpounce.c:907
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s 停止輸入訊息給您"
 
-#: src/gtkpounce.c:818
+#: src/gtkpounce.c:908
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 已經登出"
 
-#: src/gtkpounce.c:819
+#: src/gtkpounce.c:909
 #, c-format
 msgid "%s has become idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/gtkpounce.c:821
+#: src/gtkpounce.c:911
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:399
+#: src/gtkprefs.c:407
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:401
+#: src/gtkprefs.c:409
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:595
+#: src/gtkprefs.c:633
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3477,422 +3579,303 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:630
+#: src/gtkprefs.c:673
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:637 src/gtkprefs.c:2043 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:680 src/gtkprefs.c:1965 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:704
-msgid "Style"
-msgstr "風格"
-
-#: src/gtkprefs.c:705
-msgid "_Bold"
-msgstr "粗體(_B)"
-
-#: src/gtkprefs.c:707
-msgid "_Italic"
-msgstr "斜體(_I)"
-
-#: src/gtkprefs.c:709
-msgid "_Underline"
-msgstr "底線(_U)"
-
-#. who in their right mind would use this as a default anyway?
-#. * and plus, it wouldn't work as the code currently existed,
-#. * and then i went and applied simguy's patch to remove the
-#. * non-functional code.
-#. *
-#. * remove this after string freeze ends
-#.
-#: src/gtkprefs.c:719
-msgid "_Strikethrough"
-msgstr "刪除的文字(_S)"
-
-#: src/gtkprefs.c:722
-msgid "Face"
-msgstr "字體"
-
-#: src/gtkprefs.c:725
-msgid "Use custo_m face"
-msgstr "使用者自定字體(_M)"
-
-#: src/gtkprefs.c:742
-msgid "Use custom si_ze"
-msgstr "使用者自定字體大小(_Z)"
-
-#: src/gtkprefs.c:754
-msgid "Color"
-msgstr "顏色"
-
-#: src/gtkprefs.c:758
-msgid "_Text color"
-msgstr "文字顏色(_T)"
-
-#: src/gtkprefs.c:777
-msgid "Bac_kground color"
-msgstr "背景顏色(_K)"
-
-#: src/gtkprefs.c:805 src/gtkprefs.c:1037 src/gtkprefs.c:1085
+#: src/gtkprefs.c:794 src/gtkprefs.c:1026
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:806
-msgid "Show graphical _smileys"
-msgstr "顯示表情(_S)"
-
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:795
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:810
-msgid "Show _URLs as links"
-msgstr "顯示 URL 為超連結(_U)"
-
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:798
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:818
-msgid "Ignore c_olors"
-msgstr "忽略顏色(_O)"
-
-#: src/gtkprefs.c:820
-msgid "Ignore font _faces"
-msgstr "忽略字體(_F)"
-
-#: src/gtkprefs.c:822
-msgid "Ignore font si_zes"
-msgstr "忽略字體大小(_Z)"
-
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:801
+msgid "Ignore formatting on incoming messages"
+msgstr "忽略所收訊息的格式化"
+
+#: src/gtkprefs.c:813
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:814
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:816
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:819
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:820
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:823
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:846
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "按下 Ctrl-{B/I/U} 插入 HTML 標籤(_H)"
-
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:824
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
+
+#: src/gtkprefs.c:826
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:842
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:851
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:878
-msgid "Buddy List Toolbar"
-msgstr "好友清單工具列"
-
-#: src/gtkprefs.c:879 src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:857 src/gtkprefs.c:971 src/gtkprefs.c:1013
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:881 src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:859 src/gtkprefs.c:973 src/gtkprefs.c:1015
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:882 src/gtkprefs.c:1013 src/gtkprefs.c:1064
+#: src/gtkprefs.c:860 src/gtkprefs.c:974 src/gtkprefs.c:1016
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:883 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:861 src/gtkprefs.c:975 src/gtkprefs.c:1017
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:888 src/gtkprefs.c:1025 src/gtkprefs.c:1076
+#: src/gtkprefs.c:864 src/gtkprefs.c:981 src/gtkprefs.c:1023
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:891
-msgid "Group Display"
-msgstr "群組顯示"
-
-#: src/gtkprefs.c:892
-msgid "Show _numbers in groups"
-msgstr "顯示群組裡的好友/聊天室數目(_N)"
-
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:867
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:896 src/gtkprefs.c:1032
+#: src/gtkprefs.c:868 src/gtkprefs.c:986
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:870
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:872
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:876
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:901
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:936
-msgid "Send _URLs as links"
-msgstr "送出 URL 為超連結(_U)"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:908
 msgid "Show _formatting toolbar"
 msgstr "顯示格式工具列(_F)"
 
-#: src/gtkprefs.c:942
+#: src/gtkprefs.c:911
 msgid "Show a_liases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_L)"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:914
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:947
+#: src/gtkprefs.c:916
 msgid "_Tab Placement:"
 msgstr "標籤位置(_T):"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:918
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:919
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:920
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:921
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:927
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:930
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:940
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:982
-msgid "Show status _icons on tabs"
-msgstr "在標籤上顯示好友狀態(_I)"
-
-#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
+#: src/gtkprefs.c:970 src/gtkprefs.c:1012
 msgid "Window"
 msgstr "視窗"
 
-#: src/gtkprefs.c:1019 src/gtkprefs.c:1070
-msgid "New window _width:"
-msgstr "新視窗寬度(_W):"
-
-#: src/gtkprefs.c:1021 src/gtkprefs.c:1072
-msgid "New window _height:"
-msgstr "新視窗高度(_H):"
-
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1074
-msgid "_Entry field height:"
-msgstr "輸入欄高度(_E):"
-
-#: src/gtkprefs.c:1027
-msgid "Hide window on _send"
-msgstr "送出訊息後關閉視窗(_S)"
-
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:985
 msgid "Buddy Icons"
 msgstr "好友圖示"
 
-#: src/gtkprefs.c:1034
+#: src/gtkprefs.c:988
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:1038
-msgid "Show _logins in window"
-msgstr "在視窗中顯示登入訊息(_L)"
-
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:991
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:992
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1079
-msgid "Tab Completion"
-msgstr "Tab Completion"
-
-#: src/gtkprefs.c:1080
-msgid "_Tab-complete nicks"
-msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
-
-#: src/gtkprefs.c:1082
-msgid "_Old-style tab completion"
-msgstr "舊式 Tab Completion (_O)"
-
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1028
 msgid "_Show people joining in window"
 msgstr "在視窗中顯示其他人進入的事件(_S)"
 
-#: src/gtkprefs.c:1088
+#: src/gtkprefs.c:1030
 msgid "_Show people leaving in window"
 msgstr "在視窗中顯示其他人離開的事件(_S)"
 
-#: src/gtkprefs.c:1090
+#: src/gtkprefs.c:1033
 msgid "Co_lorize screen names"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1111 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4220
+#: src/gtkprefs.c:1054 src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:4219
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1056
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1065
 msgid "Public _IP:"
-msgstr ""
-
-#: src/gtkprefs.c:1146
+msgstr "公共IP (_I):"
+
+#: src/gtkprefs.c:1089
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1092
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1095
 msgid "_Start Port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1102
 msgid "_End Port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1150
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1210
+#: src/gtkprefs.c:1153
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1160
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1218
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1274
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1275
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1276
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1277
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1335
+#: src/gtkprefs.c:1278
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1279
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1337
+#: src/gtkprefs.c:1280
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1281
 msgid "Gnome Default"
 msgstr "GNOME預設值"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1290
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1341
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1345
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1409
+#: src/gtkprefs.c:1352
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1354
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1355
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1357
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1371
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3901,83 +3884,83 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1408
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1411
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1414
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1416
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1419
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1478
+#: src/gtkprefs.c:1421
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1424
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1487
+#: src/gtkprefs.c:1430
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1436
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1442
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1550
+#: src/gtkprefs.c:1449
+msgid "I_ndividual log file for each buddy's signons"
+msgstr "以個別的日誌記錄個別好友的登入(_N)"
+
+#: src/gtkprefs.c:1493
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1551
-msgid "Sounds when you _log in"
-msgstr "登入時發出音效(_L)"
-
-#: src/gtkprefs.c:1553
+#: src/gtkprefs.c:1494
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1555
+#: src/gtkprefs.c:1496
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1500
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1560
+#: src/gtkprefs.c:1501
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1562
+#: src/gtkprefs.c:1503
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1564
+#: src/gtkprefs.c:1505
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1512
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1522
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3986,74 +3969,62 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1638
-msgid "_Sending messages removes away status"
-msgstr "送出訊息時取消離開狀態(_S)"
-
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1569
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1572
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1646
-msgid "Seconds before _resending:"
-msgstr "送出回覆前的等待秒數(_R):"
-
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1573
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1575
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1653
-msgid "Send auto-response in _active conversations"
-msgstr "目前進行的交談也要送出自動回應(_A)"
-
-#: src/gtkprefs.c:1662 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:3378
+#: src/gtkprefs.c:1578 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2721 src/protocols/oscar/oscar.c:3377
 #: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1579
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1582
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1669
+#: src/gtkprefs.c:1585
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1671
+#: src/gtkprefs.c:1587
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1679
+#: src/gtkprefs.c:1595
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1680
+#: src/gtkprefs.c:1596
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1684
+#: src/gtkprefs.c:1600
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1692
+#: src/gtkprefs.c:1608
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1683
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4068,7 +4039,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1688
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4083,109 +4054,109 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:1999
+#: src/gtkprefs.c:1921
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:2013
+#: src/gtkprefs.c:1935
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:2061
+#: src/gtkprefs.c:1983
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2110
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2217
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2224
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2321
+#: src/gtkprefs.c:2243
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:2325
+#: src/gtkprefs.c:2247
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2329
+#: src/gtkprefs.c:2251
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2464
+#: src/gtkprefs.c:2386
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2422
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2423
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2502
+#: src/gtkprefs.c:2424
 msgid "Fonts"
 msgstr "字型"
 
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2425
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2504
+#: src/gtkprefs.c:2426
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2429
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2509
+#: src/gtkprefs.c:2431
 msgid "Network"
 msgstr "網路"
 
-#: src/gtkprefs.c:2510
+#: src/gtkprefs.c:2432
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2435
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2515
+#: src/gtkprefs.c:2437
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2438
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2439
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2518
+#: src/gtkprefs.c:2440
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2519
+#: src/gtkprefs.c:2441
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2522
+#: src/gtkprefs.c:2444
 msgid "Protocols"
 msgstr "通訊協定"
 
-#: src/gtkprefs.c:2523
+#: src/gtkprefs.c:2445
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4209,63 +4180,63 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1277
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:389
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:571
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:594
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:610
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -4273,13 +4244,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
+#: src/protocols/novell/novell.c:1837 src/protocols/silc/buddy.c:303
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
+#: src/protocols/novell/novell.c:1838 src/protocols/silc/buddy.c:304
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
 
@@ -4287,23 +4260,18 @@
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr "您並未登入任何一個可供您列出聊天室的通訊協定。"
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
@@ -4347,29 +4315,29 @@
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "無法儲存圖示檔案磁碟上。"
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "儲存圖示"
 
@@ -4377,11 +4345,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4390,7 +4358,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4400,50 +4368,55 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: src/log.c:661
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "請建立一個帳號。"
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>帳號:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>密碼:</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "登入"
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>帳號(_A):</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>密碼(_P):</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "帳號(_A)"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "偏好設定(_P)"
 
 #. full help text
-#: src/main.c:522
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4477,7 +4450,7 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
@@ -4504,10 +4477,10 @@
 msgstr "無聊(預設)"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:359 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/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2312
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2712
+#: src/protocols/novell/novell.c:2831 src/protocols/novell/novell.c:2882
 #: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
 #: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
@@ -4521,11 +4494,11 @@
 msgid "Away for friends only"
 msgstr "離開(只有好友可以看到我)"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:4816
-#: src/protocols/oscar/oscar.c:4840 src/protocols/oscar/oscar.c:6431
-#: src/protocols/oscar/oscar.c:6436 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/oscar/oscar.c:4746 src/protocols/oscar/oscar.c:4824
+#: src/protocols/oscar/oscar.c:4848 src/protocols/oscar/oscar.c:6436
+#: src/protocols/oscar/oscar.c:6441 src/protocols/yahoo/yahoo.c:2293
 #: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "隱身"
@@ -4543,7 +4516,7 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1659
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
@@ -4575,18 +4548,18 @@
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:399
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:287
+#: src/protocols/gg/gg.c:406
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/gg/gg.c:593 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:518
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:475
 #: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
 #: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
 #: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
@@ -4594,150 +4567,150 @@
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:609
 msgid "Reading data"
 msgstr "讀取資料中"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:612
 msgid "Balancer handshake"
 msgstr "和負載平衡器交談中"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:615
 msgid "Reading server key"
 msgstr "讀取 Server Key 中"
 
-#: src/protocols/gg/gg.c:427
+#: src/protocols/gg/gg.c:618
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:628
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:646 src/protocols/gg/gg.c:737
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:694
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:706
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:711
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:714
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:761
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:827
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:832
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
-#: src/protocols/gg/gg.c:662
+#  XXX 這個有點怪,譯錯?
+#: src/protocols/gg/gg.c:857
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4211
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4222 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4224 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4213
+#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1626
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4212
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:882 src/protocols/gg/gg.c:885
 msgid "Birth Year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:895
 msgid "Sex"
 msgstr "性別"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
+#: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
 #: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#. show it to the user
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3190 src/protocols/oscar/oscar.c:3406
+#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1301
+#: src/protocols/msn/msn.c:1545 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:3405
 #: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
 #: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:940
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:752
+#: src/protocols/gg/gg.c:948
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:815
+#: src/protocols/gg/gg.c:1011
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:823
+#: src/protocols/gg/gg.c:1019
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:1027
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:839
+#: src/protocols/gg/gg.c:1035
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:1044
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:854
+#: src/protocols/gg/gg.c:1051
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:971
+#: src/protocols/gg/gg.c:1170
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
-#: src/protocols/gg/gg.c:972
+#: src/protocols/gg/gg.c:1171
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4745,34 +4718,34 @@
 "因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題,所以 Gaim 沒有辦法完成您所指定的"
 "工作。請待會兒重試。"
 
-#: src/protocols/gg/gg.c:1000
+#: src/protocols/gg/gg.c:1200
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:1001
+#: src/protocols/gg/gg.c:1201
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1074
+#: src/protocols/gg/gg.c:1274
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
+#: src/protocols/gg/gg.c:1275 src/protocols/gg/gg.c:1298
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1297
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:1146
+#: src/protocols/gg/gg.c:1348
 msgid "Unable to access directory"
 msgstr "無法存取目錄"
 
-#: src/protocols/gg/gg.c:1147
+#: src/protocols/gg/gg.c:1349
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4780,11 +4753,11 @@
 "因為 Gaim 沒有辦法連上名錄伺服器,所以無法搜尋名錄上的資料。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1180
+#: src/protocols/gg/gg.c:1383
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法修改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1181
+#: src/protocols/gg/gg.c:1384
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4792,32 +4765,32 @@
 "因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器,所以無法修改您的密碼。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1198
+#: src/protocols/gg/gg.c:1401
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1410 src/protocols/jabber/jabber.c:1060
+#: src/protocols/toc/toc.c:1553
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1418
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1424
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1430
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1464
 msgid "Unable to access user profile."
 msgstr "無法讀取使用者簡介檔。"
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1465
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4835,8 +4808,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
+#: src/protocols/gg/gg.c:1607 src/protocols/gg/gg.c:1609
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4850,16 +4822,16 @@
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2932
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:2931
+#: src/protocols/oscar/oscar.c:5452
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2934
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:2933
+#: src/protocols/oscar/oscar.c:5453
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4921,39 +4893,34 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 無法開啟監聽埠。"
 
-# XXX 暫譯
 #: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
-# XXX 暫譯
 #: src/protocols/irc/irc.c:73
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
-# XXX 暫譯
 #: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
-# XXX 暫譯
 #: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-# XXX 暫譯
 #: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
 #: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6532
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6537
 #: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:168 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
@@ -4974,16 +4941,23 @@
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
+#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
+msgid "Couldn't connect to host"
+msgstr "無法連到伺服器"
+
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:372 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:506 src/protocols/silc/chat.c:1264
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:509 src/protocols/silc/chat.c:1267
+#: src/protocols/silc/ops.c:1001 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "主題"
 
@@ -4996,32 +4970,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:612
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:614
+#: src/protocols/irc/irc.c:613
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1383 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:630 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1385 src/protocols/napster/napster.c:655
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1404
-#: src/protocols/msn/msn.c:1742 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:633 src/protocols/jabber/jabber.c:1406
+#: src/protocols/msn/msn.c:1725 src/protocols/napster/napster.c:660
+#: src/protocols/silc/silc.c:1044 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1399
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:581
+#: src/protocols/irc/irc.c:639 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586
 msgid "Username"
 msgstr "使用者"
 
@@ -5100,107 +5074,107 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:404
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:415
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:418
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:423
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:443
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:499
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:596
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:601
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:622
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:701
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:723
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:763
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:765
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:840
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:862
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:871
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:777
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
@@ -5212,18 +5186,18 @@
 
 #: src/protocols/jabber/auth.c:111
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "伺服器需要經由未經加密的串流進行純文字認證"
+msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
 #: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
 #: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
 msgid "Plaintext Authentication"
-msgstr "純文字認證"
+msgstr "明文認證"
 
 #: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
-msgstr "伺服器需要經由未經加密的串流進行純文字認證。允許並繼續進行認證?"
+msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
 #: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
@@ -5247,11 +5221,11 @@
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/jabber.c:606 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "暱稱"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
 msgid "URL"
 msgstr "URL"
 
@@ -5272,7 +5246,7 @@
 msgstr "省/州"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:631
+#: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "郵遞區號"
 
@@ -5288,7 +5262,8 @@
 msgstr "電話"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:632
+#: src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "電子郵件"
 
@@ -5328,8 +5303,9 @@
 msgstr "Jabber 帳號"
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:566
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2734
+#: src/protocols/novell/novell.c:2738 src/protocols/oscar/oscar.c:566
 #: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
 #: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
@@ -5340,18 +5316,17 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1386
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1388
 msgid "Resource"
 msgstr ""
 
-# TODO: Untranslated
-# NOTE: 中文怎樣譯這個呢?好像沒有這種東西,譯成甚麼都好像怪怪的,其他po檔怎樣譯呢?
-# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文只是把「Middle Name」音譯便算了
+# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
+# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
 #: src/protocols/jabber/buddy.c:624
 msgid "Middle Name"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
+msgstr "英文別名"
+
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
 #: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
 msgid "Address"
 msgstr "地址"
@@ -5364,13 +5339,10 @@
 msgid "Photo"
 msgstr "照片"
 
-# TODO Untranslated <- 我的中文程度真的很差
-# XXX  譯成「徽號」是否通順/正確?
-# NOTE「Organization Logo」之略,即謂個人是不可能有 Logo 的
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
 #: src/protocols/jabber/buddy.c:761
 msgid "Logo"
-msgstr ""
+msgstr "標誌"
 
 #: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
@@ -5499,25 +5471,9 @@
 msgstr "對工作階段進行初始化時發生了錯誤"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
-#: src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "寫入錯誤"
 
@@ -5528,104 +5484,104 @@
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: src/protocols/jabber/jabber.c:317
+#: src/protocols/jabber/jabber.c:322
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: src/protocols/jabber/jabber.c:320
+#: src/protocols/jabber/jabber.c:325
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/jabber/jabber.c:426
+#: src/protocols/jabber/jabber.c:431
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1031
 msgid "Password"
 msgstr "密碼"
 
-#: src/protocols/jabber/jabber.c:596
+#: src/protocols/jabber/jabber.c:601
 msgid "E-Mail"
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4267
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4267
 #: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/silc.c:634
 msgid "Phone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/jabber.c:651
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:654
+#: src/protocols/jabber/jabber.c:659
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:944
+#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:2097 src/protocols/oscar/oscar.c:944
 #: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "連線中"
 
-#: src/protocols/jabber/jabber.c:779
+#: src/protocols/jabber/jabber.c:784
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: src/protocols/jabber/jabber.c:785
+#: src/protocols/jabber/jabber.c:790
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:794
+#: src/protocols/jabber/jabber.c:799
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5816
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
+#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5823
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5634,200 +5590,200 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:910
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:912
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:914
 msgid "From"
 msgstr "已認證對方"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:917
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:919
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:923
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:943
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "想聊天"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4828
-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4836
+#: src/protocols/oscar/oscar.c:6432
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: src/protocols/jabber/jabber.c:971
+#: src/protocols/jabber/jabber.c:976
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: src/protocols/jabber/jabber.c:972
+#: src/protocols/jabber/jabber.c:977
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:1036
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1041 src/protocols/jabber/jabber.c:1042
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1042
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1539
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1133
+#: src/protocols/jabber/jabber.c:1138
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1135
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
 msgstr "衝突"
 
-#: src/protocols/jabber/jabber.c:1137
+#: src/protocols/jabber/jabber.c:1142
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 # TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1144
 msgid "Forbidden"
 msgstr ""
 
 # TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1152
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
 msgstr "必須付款"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "接收者不存在"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1166
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "伺服器不存在"
 
 # TODO 要看Jabber標準
 # XXX 暫時假設「Subscription」一詞為Jabber術語,譯「認證」,需要核實
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1176
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1185
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1196
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5837,119 +5793,119 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1214
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1234
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1242
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1246
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1281
 msgid "Hide Operating System"
 msgstr "隱藏作業系統"
 
@@ -5963,26 +5919,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1362 src/protocols/jabber/jabber.c:1364
+#: src/protocols/jabber/jabber.c:1364 src/protocols/jabber/jabber.c:1366
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1389
+#: src/protocols/jabber/jabber.c:1391
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1396
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1401
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "允許使用純文字模式,在未經加密的串流上進行認證"
-
-#: src/protocols/jabber/jabber.c:1408
+msgstr "允許使用明文,在未經加密的串流上進行認證"
+
+#. Account options
+#: src/protocols/jabber/jabber.c:1410 src/protocols/silc/silc.c:1040
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6065,19 +6021,19 @@
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
 msgid "Unable to request USR\n"
 msgstr "無法取得 USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
 msgid "Unable to login using MD5"
 msgstr "無法使用 MD5 登入"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
 msgid "Unable to send USR"
 msgstr "無法送出 USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
 msgid "Requesting to send password"
 msgstr "送出密碼中"
 
@@ -6085,11 +6041,11 @@
 msgid "Protocol version not supported"
 msgstr "不支援這個版本的通訊協定"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
 msgid "Unable to request CVR\n"
 msgstr "無法取得 CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to request INF\n"
 msgstr "無法取得 INF\n"
 
@@ -6105,12 +6061,11 @@
 msgid "Unable to parse message."
 msgstr "無法解析訊息。"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
-#: src/protocols/msn/notification.c:1826
+#: src/protocols/msn/dispatch.c:232
 msgid "Unable to write to server"
 msgstr "無法寫入到伺服器"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
@@ -6163,7 +6118,7 @@
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6274,7 +6229,7 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
 msgid "Unable to write"
 msgstr "無法寫入"
 
@@ -6311,8 +6266,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1357
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1356
+#: src/protocols/silc/ops.c:1198 src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6346,38 +6301,38 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:79
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:187
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:188
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:200
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:211
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:222
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:231
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:232
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6385,93 +6340,93 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:240
+#: src/protocols/msn/msn.c:236
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:241
+#: src/protocols/msn/msn.c:237
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:255
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:257
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:672
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:674
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
 #: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2150
-#: src/protocols/novell/novell.c:2263 src/protocols/novell/novell.c:2317
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:676
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2718
+#: src/protocols/novell/novell.c:2833 src/protocols/novell/novell.c:2887
+#: src/protocols/silc/buddy.c:1364 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
 #: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:680
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
 #: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:682
+#: src/protocols/zephyr/zephyr.c:1180 src/protocols/zephyr/zephyr.c:1195
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:378
+#: src/protocols/msn/msn.c:377
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:386
+#: src/protocols/msn/msn.c:385
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:391
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:397
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:407
+#: src/protocols/msn/msn.c:406
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:413
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:440
+#: src/protocols/msn/msn.c:442
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-# NOTE: 原譯文有誤
-#: src/protocols/msn/msn.c:449
+#: src/protocols/msn/msn.c:452
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:473
+#: src/protocols/msn/msn.c:476
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6479,7 +6434,7 @@
 "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
 "gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:785
+#: src/protocols/msn/msn.c:799
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6488,12 +6443,12 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:840
 msgid "Invalid MSN screen name"
 msgstr "無效的 MSN 使用者帳號"
 
 # MSN6.0中文版對「Block」一詞的譯文為「封鎖」
-#: src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:836
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6502,83 +6457,83 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的封鎖清單。"
 
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1372 src/protocols/oscar/oscar.c:4252
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4239
+#: src/protocols/msn/msn.c:1379 src/protocols/oscar/oscar.c:4238
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1394 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1402 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+#: src/protocols/msn/msn.c:1419 src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1439
+#: src/protocols/msn/msn.c:1446
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
-#: src/protocols/msn/msn.c:1505
+#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1468
+#: src/protocols/msn/msn.c:1475
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
-#: src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1490
+#: src/protocols/msn/msn.c:1497
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/msn/msn.c:1506 src/protocols/msn/msn.c:1512
 #: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1520 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1531 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1553 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/msn/msn.c:1626
+#: src/protocols/msn/msn.c:1612
 msgid "Display conversation closed notices"
 msgstr "顯示「交談視窗已關閉」的通知"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1617
 msgid "Display timeout notices"
 msgstr "顯示「交談已逾時」的通知"
 
@@ -6592,16 +6547,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1717 src/protocols/msn/msn.c:1719
+#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1737 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1720 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1746
+#: src/protocols/msn/msn.c:1729
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6621,55 +6575,51 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "嘗試經由 MSN 的登入伺服器進行認證期間,發生了不明的錯誤。"
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
-#: src/protocols/oscar/oscar.c:1646
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/oscar/oscar.c:1645
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/msn/notification.c:361
-msgid "Unable to send password"
-msgstr "無法送出密碼"
-
-#: src/protocols/msn/notification.c:397
+#: src/protocols/msn/notification.c:355
 msgid "Protocol not supported"
 msgstr "不支援這個通訊協定"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:386
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:392
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "您已中斷連線,MSN 伺服器將暫時關閉。"
 
-#: src/protocols/msn/notification.c:584
+#: src/protocols/msn/notification.c:527
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1078
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "使用者 %s(%s)想要將您加入他(她)的好友清單"
 
-#: src/protocols/msn/notification.c:1362
+#: src/protocols/msn/notification.c:1351
 #, c-format
 msgid ""
 "Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
 "again."
 msgstr "暫時無法取得 %s 的好友清單,請過一會後重試。"
 
-#: src/protocols/msn/notification.c:1607
+#: src/protocols/msn/notification.c:1612
 msgid "Unable to transfer to notification server"
 msgstr "無法傳送至通知伺服器"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:1776
+#: src/protocols/msn/notification.c:1799
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6696,24 +6646,42 @@
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: src/protocols/msn/servconn.c:389
-msgid "IO Error."
-msgstr "IO 錯誤。"
-
-#: src/protocols/msn/servconn.c:527
+#: src/protocols/msn/servconn.c:210
+#, c-format
+msgid "Unable to connect to %s server"
+msgstr "無法連線到 %s 伺服器"
+
+#: src/protocols/msn/servconn.c:214
+#, c-format
+msgid "Error writing to %s server"
+msgstr "由 %s 伺服器讀取時發生錯誤"
+
+#: src/protocols/msn/servconn.c:218
+#, c-format
+msgid ""
+"Error reading from %s server. Lastcommand was:\n"
+" %s"
+msgstr "由 %s 伺服器讀取時發生錯誤,最後一個指令為 %s"
+
+#: src/protocols/msn/servconn.c:222
+#, c-format
+msgid "Unknown error from %s server"
+msgstr "%s 伺服器傳來了一個不明的錯誤"
+
+#: src/protocols/msn/servconn.c:315
 msgid "Received HTTP error. Please report this."
 msgstr "收到一個 HTTP 錯誤;請向開發者報告。"
 
-#: src/protocols/msn/switchboard.c:150
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "目前的交談閒置太久,並且已經逾時。"
 
-#: src/protocols/msn/switchboard.c:159
+#: src/protocols/msn/switchboard.c:130
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 關閉了交談視窗。"
 
-#: src/protocols/msn/switchboard.c:300
+#: src/protocols/msn/switchboard.c:264
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
@@ -6759,12 +6727,12 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:541
+#: src/protocols/napster/napster.c:541 src/protocols/silc/chat.c:741
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5522
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5523
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -6778,74 +6746,102 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:637 src/protocols/napster/napster.c:639
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr "登入失敗 (0x%X)。"
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: src/protocols/novell/novell.c:225
-#, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "無法送出訊息。無法取得使用者的細節 (0x%X)。"
-
-#: src/protocols/novell/novell.c:371
-#, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "無法把 %s 加至您的好友清單 (0x%X)。"
+#: src/protocols/novell/novell.c:232
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
+
+#: src/protocols/novell/novell.c:378
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:397
-#, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "無法送出訊息 (0x%X)。"
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr "無法送出訊息至 %s。無法建立會議 (0x%X)。"
-
-#: src/protocols/novell/novell.c:489
-#, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "無法送出訊息。無法建立會議 (0x%X)。"
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "無法送出訊息 (%s)。"
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "無法邀請使用者 (%s)。"
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "無法送出訊息。無法建立會議 (%s)。"
+
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-"無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (0x%X)。"
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
+
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (0x%X)。"
-
-#  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "GroupWise 會議 %d"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr "無法取得使用者 %s 的細節 (0x%X)。"
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+"list (%s)."
+msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "無法取得使用者 %s 的細節 (%s)。"
+
+#  FIXME 譯文有待改進
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "無法把使用者加至您的隱私清單 (%s)。"
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "無法把 %s 加至您的允許清單 (%s)。"
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
+
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1568
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "無法在伺服器端修改隱私設定 (%s)。"
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "無法建立會議 (%s)。"
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1607
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: src/protocols/novell/novell.c:982
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
 msgstr "使用者 ID"
 
@@ -6862,38 +6858,49 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:996
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「User Properties」係指「使用者資訊」,感謝KingAnt及LSchiere解釋
-#: src/protocols/novell/novell.c:1016
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
 msgstr "使用者資訊"
 
-#: src/protocols/novell/novell.c:1084
+#  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
+#: src/protocols/novell/novell.c:1558
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise 會議 %d"
+
+#: src/protocols/novell/novell.c:1583
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1113
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr "處理事件或回覆時發生錯誤 (0x%X)。"
-
-#: src/protocols/novell/novell.c:1147
+#: src/protocols/novell/novell.c:1613
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "處理事件或回覆時發生錯誤 (%s)。"
+
+#: src/protocols/novell/novell.c:1647
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1162
+#: src/protocols/novell/novell.c:1662
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: src/protocols/novell/novell.c:1302
+#: src/protocols/novell/novell.c:1795
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "邀請了 %s 加入這個交談。"
+
+#: src/protocols/novell/novell.c:1822
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: src/protocols/novell/novell.c:1303
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6904,16 +6911,16 @@
 "\n"
 "時間:%s"
 
-#: src/protocols/novell/novell.c:1305
+#: src/protocols/novell/novell.c:1825
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:1408
+#: src/protocols/novell/novell.c:1930
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1984
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6923,44 +6930,38 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:1560
+#: src/protocols/novell/novell.c:2082
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:1582
+#: src/protocols/novell/novell.c:2104
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:1846
+#: src/protocols/novell/novell.c:2413
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2156 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5818 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2724 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5825 src/protocols/yahoo/yahoo.c:2297
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2164
-#, c-format
-msgid ""
-"<b>Status:</b> %s\n"
-"<b>Message:</b> %s"
-msgstr ""
-"<b>狀態:</b>%s\n"
-"<b>訊息:</b>%s"
-
-#: src/protocols/novell/novell.c:2168
-#, c-format
-msgid "<b>Status:</b> %s"
-msgstr "<b>狀態:</b>%s"
-
-#  NOTE 這是「似乎是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2264 src/protocols/novell/novell.c:2320
+#: src/protocols/novell/novell.c:2735
+msgid "Message"
+msgstr "訊息"
+
+#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2890
 msgid "Appear Offline"
 msgstr "離線"
 
+#: src/protocols/novell/novell.c:3283
+msgid "Initiate _Chat"
+msgstr "開啟聊天室(_C)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6971,16 +6972,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:2409 src/protocols/novell/novell.c:2411
+#: src/protocols/novell/novell.c:3356 src/protocols/novell/novell.c:3358
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:2428
+#: src/protocols/novell/novell.c:3375
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:2432
+#: src/protocols/novell/novell.c:3379
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
@@ -7093,11 +7093,11 @@
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:434 src/protocols/silc/silc.c:630
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6545
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -7180,18 +7180,18 @@
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4837
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4845
+#: src/protocols/oscar/oscar.c:6435
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4839
+#: src/protocols/oscar/oscar.c:6433
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4834
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4842
+#: src/protocols/oscar/oscar.c:6434
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -7227,10 +7227,6 @@
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
-msgid "Couldn't connect to host"
-msgstr "無法連到伺服器"
-
 #: src/protocols/oscar/oscar.c:886
 msgid "Screen name sent"
 msgstr "送出帳號"
@@ -7249,7 +7245,7 @@
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1450
+#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1449
 msgid "Could Not Connect"
 msgstr "無法連線"
 
@@ -7270,20 +7266,20 @@
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:1334 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1333 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1339
+#: src/protocols/oscar/oscar.c:1338
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1343
+#: src/protocols/oscar/oscar.c:1342
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即時訊息服務暫時不存在。"
 
-#: src/protocols/oscar/oscar.c:1348
+#: src/protocols/oscar/oscar.c:1347
 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."
@@ -7291,21 +7287,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1353
+#: src/protocols/oscar/oscar.c:1352
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1385
+#: src/protocols/oscar/oscar.c:1384
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1457
+#: src/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:1493 src/protocols/oscar/oscar.c:1523
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:1522
+#: src/protocols/oscar/oscar.c:1610
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7314,29 +7310,29 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:1525
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1614
+#: src/protocols/oscar/oscar.c:1613
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:2196 src/protocols/oscar/oscar.c:5922
+#: src/protocols/oscar/oscar.c:2195 src/protocols/oscar/oscar.c:5929
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2552
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:2551
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2713
+#: src/protocols/oscar/oscar.c:2712
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2716
+#: src/protocols/oscar/oscar.c:2715
 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 "
@@ -7345,46 +7341,46 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:6304
+#: src/protocols/oscar/oscar.c:2720 src/protocols/oscar/oscar.c:6309
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:2750
+#: src/protocols/oscar/oscar.c:2749
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
+#: src/protocols/oscar/oscar.c:2757
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息:"
+
 #: src/protocols/oscar/oscar.c:2758
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息:"
-
-#: src/protocols/oscar/oscar.c:2759
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2788
+#: src/protocols/oscar/oscar.c:2787
 #, 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:2793 src/protocols/oscar/oscar.c:2795
+#: src/protocols/oscar/oscar.c:2792 src/protocols/oscar/oscar.c:2794
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:2833
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:2922
-#: src/protocols/oscar/oscar.c:2942 src/protocols/oscar/oscar.c:3286
-#: src/protocols/oscar/oscar.c:3346 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:2832
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:2921
+#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3285
+#: src/protocols/oscar/oscar.c:3345 src/protocols/oscar/oscar.c:5444
+#: src/protocols/oscar/oscar.c:5490
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:2838
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2921
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7393,11 +7389,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2930 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:2929 src/protocols/oscar/oscar.c:5450
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:2941
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7407,17 +7403,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:2942
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2950
+#: src/protocols/oscar/oscar.c:2949
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:2957
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7430,7 +7426,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2966
+#: src/protocols/oscar/oscar.c:2965
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7443,7 +7439,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2974
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7456,34 +7452,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2995
+#: src/protocols/oscar/oscar.c:2994
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3001
+#: src/protocols/oscar/oscar.c:3000
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3005
+#: src/protocols/oscar/oscar.c:3004
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3089
 #, 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:3099
+#: src/protocols/oscar/oscar.c:3098
 #, 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:3108
+#: src/protocols/oscar/oscar.c:3107
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7493,83 +7489,83 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3116
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3125
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3134
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: src/protocols/oscar/oscar.c:3189
+#: src/protocols/oscar/oscar.c:3188
 #, 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:3248
+#: src/protocols/oscar/oscar.c:3247
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3248
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3284
+#: src/protocols/oscar/oscar.c:3283
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3343
+#: src/protocols/oscar/oscar.c:3342
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3366
+#: src/protocols/oscar/oscar.c:3365
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3368
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3372 src/protocols/yahoo/yahoo.c:3088
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:3454
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3641
+#: src/protocols/oscar/oscar.c:3640
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:3858
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3859
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7577,28 +7573,32 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3923
+#: src/protocols/oscar/oscar.c:3922
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3925
+#: src/protocols/oscar/oscar.c:3924
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3955
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4226 src/protocols/oscar/oscar.c:4233
+#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4237
 msgid "Mobile Phone"
 msgstr "行動電話"
 
+#: src/protocols/oscar/oscar.c:4238
+msgid "Not specified"
+msgstr "沒有填寫"
+
 #: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
@@ -7754,11 +7754,16 @@
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4686
+#: src/protocols/oscar/oscar.c:4536
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
+
+#: src/protocols/oscar/oscar.c:4694
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4687
+#: src/protocols/oscar/oscar.c:4695
 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 "
@@ -7767,7 +7772,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4714
+#: src/protocols/oscar/oscar.c:4722
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7778,19 +7783,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:4719
+#: src/protocols/oscar/oscar.c:4727
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4735 src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6440
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:4753
+#: src/protocols/oscar/oscar.c:4761
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:4762
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7799,7 +7804,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4794
+#: src/protocols/oscar/oscar.c:4802
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7810,11 +7815,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:4799
+#: src/protocols/oscar/oscar.c:4807
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4892
+#: src/protocols/oscar/oscar.c:4893
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7825,16 +7830,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:5310
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:5311
+#: src/protocols/oscar/oscar.c:5324
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5030
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5031
 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 "
@@ -7843,13 +7848,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5206 src/protocols/oscar/oscar.c:5207
-#: src/protocols/oscar/oscar.c:5212 src/protocols/oscar/oscar.c:5367
-#: src/protocols/oscar/oscar.c:5368 src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5207 src/protocols/oscar/oscar.c:5208
+#: src/protocols/oscar/oscar.c:5213 src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5369 src/protocols/oscar/oscar.c:5374
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5309
+#: src/protocols/oscar/oscar.c:5310
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7858,11 +7863,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5309 src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5310 src/protocols/oscar/oscar.c:5323
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5323
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7872,7 +7877,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5404
+#: src/protocols/oscar/oscar.c:5405
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7882,11 +7887,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5410
+#: src/protocols/oscar/oscar.c:5411
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5444
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7896,18 +7901,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5486
 #, 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:5486
+#: src/protocols/oscar/oscar.c:5487
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:5490
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7917,85 +7922,89 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:5491
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:5527 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5528 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:5550
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:5790
+#: src/protocols/oscar/oscar.c:5640
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
+
+#: src/protocols/oscar/oscar.c:5797
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6284
+#: src/protocols/oscar/oscar.c:6289
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:6297
+#: src/protocols/oscar/oscar.c:6302
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6305
 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:6485
+#: src/protocols/oscar/oscar.c:6490
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6501
+#: src/protocols/oscar/oscar.c:6506
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6514
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6529
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6553
+#: src/protocols/oscar/oscar.c:6558
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6579
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6575
+#: src/protocols/oscar/oscar.c:6580
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6581
+#: src/protocols/oscar/oscar.c:6586
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:6635
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6674
+#: src/protocols/oscar/oscar.c:6679
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6682
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6683
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8003,76 +8012,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:6699
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6700
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6701
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:6718
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6719
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6795
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:6802
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:6810
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:6817
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:6824
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6832
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6836
+#: src/protocols/oscar/oscar.c:6843
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:6842
+#: src/protocols/oscar/oscar.c:6849
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:6855
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6854
+#: src/protocols/oscar/oscar.c:6861
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:6870
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6871
+#: src/protocols/oscar/oscar.c:6878
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:6885
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8086,19 +8095,1043 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:7002 src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7006 src/protocols/oscar/oscar.c:7008
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7025
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7026
+#: src/protocols/oscar/oscar.c:7030
 msgid "Auth port"
 msgstr "認證通訊埠"
 
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:401
+#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:661
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "使用者 %s 不在網路上"
+
+#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
+#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+msgid "Key Agreement"
+msgstr "交換密鑰"
+
+#: src/protocols/silc/buddy.c:49
+msgid "Cannot perform the key agreement"
+msgstr "無法交換密鑰"
+
+#: src/protocols/silc/buddy.c:106
+msgid "Error occurred during key agreement"
+msgstr "交換密鑰中出現錯誤"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Key Agreement failed"
+msgstr "交換密鑰失敗"
+
+#: src/protocols/silc/buddy.c:115
+msgid "Timeout during key agreement"
+msgstr "交換密鑰逾時"
+
+#: src/protocols/silc/buddy.c:120
+msgid "Key agreement was aborted"
+msgstr "交換密鑰被中止"
+
+#: src/protocols/silc/buddy.c:125
+msgid "Key agreement is already started"
+msgstr "交換密鑰己開始"
+
+#: src/protocols/silc/buddy.c:130
+msgid "Key agreement cannot be started with yourself"
+msgstr "不可與自己交換密鑰"
+
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:369
+#: src/protocols/silc/buddy.c:480
+msgid "The remote user is not present in the network any more"
+msgstr "遠端使用者已不在網路上"
+
+#: src/protocols/silc/buddy.c:284
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr "由 %s 收到一個交換密鑰要求,您想交換密鑰嗎?"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"遠端的使用者正在等候交換密鑰:\n"
+"遠端主機 :%s\n"
+"遠端通訊埠:%d"
+
+#: src/protocols/silc/buddy.c:301
+msgid "Key Agreement Request"
+msgstr "交換密鑰要求"
+
+#: src/protocols/silc/buddy.c:368 src/protocols/silc/buddy.c:403
+#: src/protocols/silc/buddy.c:445
+msgid "IM With Password"
+msgstr "有密碼之即時訊息"
+
+#: src/protocols/silc/buddy.c:404
+msgid "Cannot set IM key"
+msgstr "無法設定即時訊息密鑰"
+
+#: src/protocols/silc/buddy.c:446
+msgid "Set IM Password"
+msgstr "設定即時訊息密碼"
+
+#: src/protocols/silc/buddy.c:479 src/protocols/silc/buddy.c:514
+#: src/protocols/silc/ops.c:1064 src/protocols/silc/ops.c:1075
+msgid "Get Public Key"
+msgstr "取得公鑰"
+
+#: src/protocols/silc/buddy.c:515 src/protocols/silc/ops.c:1065
+#: src/protocols/silc/ops.c:1076
+msgid "Cannot fetch the public key"
+msgstr "無法取得公鑰"
+
+#: src/protocols/silc/buddy.c:584 src/protocols/silc/buddy.c:1596
+msgid "Show Public Key"
+msgstr "顯示公鑰"
+
+#: src/protocols/silc/buddy.c:585 src/protocols/silc/buddy.c:944
+#: src/protocols/silc/chat.c:210
+msgid "Could not load public key"
+msgstr "無法載入公鑰"
+
+#: src/protocols/silc/buddy.c:662 src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:892 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:976 src/protocols/silc/ops.c:982
+#: src/protocols/silc/ops.c:983
+msgid "User Information"
+msgstr "使用者資訊"
+
+#: src/protocols/silc/buddy.c:663 src/protocols/silc/ops.c:893
+msgid "Cannot get user information"
+msgstr "無法讀取使用者資訊"
+
+#: src/protocols/silc/buddy.c:684
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "好友 %s 不被信任"
+
+#: src/protocols/silc/buddy.c:687
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
+"鑰」指令即可。"
+
+#: src/protocols/silc/buddy.c:987
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "好友 %s 不在網路上"
+
+#: src/protocols/silc/buddy.c:990
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
+
+#: src/protocols/silc/buddy.c:993
+msgid "Import..."
+msgstr "匯入..."
+
+#: src/protocols/silc/buddy.c:1080
+msgid "Select correct user"
+msgstr "選擇正確的使用者"
+
+#: src/protocols/silc/buddy.c:1082
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: src/protocols/silc/buddy.c:1084
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: src/protocols/silc/buddy.c:1358
+msgid "Detached"
+msgstr "暫停連線"
+
+#  NOTE (01:24:07) wing: what is a status of "indisposed"?
+#  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
+#  NOTE (01:25:51) LSchiere: or "not feeling well"
+#: src/protocols/silc/buddy.c:1362 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "不適"
+
+#  XXX
+#: src/protocols/silc/buddy.c:1366 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "叫醒我!"
+
+#  XXX
+#: src/protocols/silc/buddy.c:1368 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "極度活躍"
+
+#: src/protocols/silc/buddy.c:1370
+msgid "Robot"
+msgstr ""
+
+#: src/protocols/silc/buddy.c:1377 src/protocols/silc/silc.c:605
+msgid "Happy"
+msgstr "開心"
+
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:607
+msgid "Sad"
+msgstr "憂愁"
+
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:609
+msgid "Angry"
+msgstr "憤怒"
+
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:611
+msgid "Jealous"
+msgstr "嫉妒"
+
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:613
+msgid "Ashamed"
+msgstr "慚愧"
+
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:615
+msgid "Invincible"
+msgstr "無敵"
+
+#: src/protocols/silc/buddy.c:1389 src/protocols/silc/silc.c:617
+msgid "In Love"
+msgstr "戀愛中"
+
+#: src/protocols/silc/buddy.c:1391 src/protocols/silc/silc.c:619
+msgid "Sleepy"
+msgstr "想睡"
+
+#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:621
+msgid "Bored"
+msgstr "發悶"
+
+#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:623
+msgid "Excited"
+msgstr "興奮"
+
+#: src/protocols/silc/buddy.c:1397 src/protocols/silc/silc.c:625
+msgid "Anxious"
+msgstr "憂慮"
+
+#: src/protocols/silc/buddy.c:1576
+msgid "Reset IM Key"
+msgstr "清除即時訊息密鑰"
+
+#: src/protocols/silc/buddy.c:1582
+msgid "IM with Key Exchange"
+msgstr "要交換密鑰之即時訊息"
+
+#: src/protocols/silc/buddy.c:1588
+msgid "IM with Password"
+msgstr "有密碼之即時訊息"
+
+#: src/protocols/silc/buddy.c:1602
+msgid "Get Public Key..."
+msgstr "取得公鑰..."
+
+#: src/protocols/silc/buddy.c:1609
+msgid "Send File..."
+msgstr "傳送檔案..."
+
+#: src/protocols/silc/buddy.c:1616 src/protocols/silc/ops.c:1111
+msgid "Kill User"
+msgstr "從網路上移除使用者"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "密碼(_P):"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "頻道 %s 不在網路上"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:153
+#: src/protocols/silc/chat.c:154
+msgid "Channel Information"
+msgstr "頻道資訊"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "無法取得頻道資訊"
+
+#: src/protocols/silc/chat.c:209
+msgid "Add Channel Public Key"
+msgstr "新增頻道公鑰"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:264
+msgid "Open Public Key..."
+msgstr "開啟公鑰..."
+
+#: src/protocols/silc/chat.c:375
+msgid "Channel Passphrase"
+msgstr "頻道密碼"
+
+#: src/protocols/silc/chat.c:382
+msgid "Channel Public Keys List"
+msgstr "頻道公鑰清單"
+
+#: src/protocols/silc/chat.c:387
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數位"
+"簽章。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公鑰,加入頻"
+"道就必須擁有所列公鑰內之其一。"
+
+#  XXX 暫譯
+#: src/protocols/silc/chat.c:396 src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:434 src/protocols/silc/chat.c:435
+#: src/protocols/silc/chat.c:773
+msgid "Channel Authentication"
+msgstr "頻道認證"
+
+# XXX may be wrong
+#: src/protocols/silc/chat.c:536
+msgid "Group Name"
+msgstr "聊天室名稱"
+
+#: src/protocols/silc/chat.c:540 src/protocols/silc/ops.c:1387
+msgid "Passphrase"
+msgstr "密碼"
+
+#: src/protocols/silc/chat.c:551
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
+
+#: src/protocols/silc/chat.c:553
+msgid "Add Channel Private Group"
+msgstr "新增頻道小圈子"
+
+# XXX may be wrong
+#: src/protocols/silc/chat.c:654
+msgid "User Limit"
+msgstr "使用者數目上限"
+
+#: src/protocols/silc/chat.c:655
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
+
+#: src/protocols/silc/chat.c:750
+msgid "Invite List"
+msgstr "邀請清單"
+
+#  XXX 暫譯
+#: src/protocols/silc/chat.c:756
+msgid "Ban List"
+msgstr "禁止清單"
+
+#: src/protocols/silc/chat.c:765
+msgid "Add Private Group"
+msgstr "新增小圈子"
+
+#: src/protocols/silc/chat.c:780
+msgid "Reset Permanent"
+msgstr "清除永久性頻道模式"
+
+#: src/protocols/silc/chat.c:786
+msgid "Set Permanent"
+msgstr "設定永久性頻道模式"
+
+#  XXX may be wrong
+#: src/protocols/silc/chat.c:795
+msgid "Set User Limit"
+msgstr "設定使用者數目上限"
+
+#: src/protocols/silc/chat.c:802
+msgid "Reset Topic Restriction"
+msgstr "清除主題限制"
+
+#: src/protocols/silc/chat.c:808
+msgid "Set Topic Restriction"
+msgstr "設定主題限制"
+
+#: src/protocols/silc/chat.c:816
+msgid "Reset Private Channel"
+msgstr "清除私用頻道模式"
+
+#: src/protocols/silc/chat.c:822
+msgid "Set Private Channel"
+msgstr "設定私用頻道模式"
+
+#: src/protocols/silc/chat.c:830
+msgid "Reset Secret Channel"
+msgstr "清除秘密頻道模式"
+
+#: src/protocols/silc/chat.c:836
+msgid "Set Secret Channel"
+msgstr "設定秘密頻道模式"
+
+#  XXX 暫譯
+#: src/protocols/silc/chat.c:907
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "您是 <I>%s</I> 的頻道創立者"
+
+#: src/protocols/silc/chat.c:911
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
+
+#: src/protocols/silc/chat.c:961
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr "加入小圈子前,您必須首先加入頻道 %s"
+
+#: src/protocols/silc/chat.c:963
+msgid "Join Private Group"
+msgstr "加入小圈子"
+
+#: src/protocols/silc/chat.c:964
+msgid "Cannot join private group"
+msgstr "無法加入小圈子"
+
+#: src/protocols/silc/chat.c:1146 src/protocols/silc/silc.c:844
+msgid "Cannot call command"
+msgstr "無法執行指令"
+
+#: src/protocols/silc/chat.c:1147 src/protocols/silc/silc.c:845
+msgid "Unknown command"
+msgstr "未知的指令"
+
+#  NOTE 這些都是視窗標題
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "加密檔案傳輸"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr "檔案傳輸時發生錯誤"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "拒絕不符權限的操作"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "交換密鑰失敗"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "沒有檔案傳輸工作階段"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "沒有進行中的檔案傳輸工作階段"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "檔案傳輸已開始"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "無法交換密鑰以供傳輸"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "無法開始檔案傳輸"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "無法傳送檔案"
+
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
+
+#: src/protocols/silc/ops.c:398
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
+
+#: src/protocols/silc/ops.c:402
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
+
+#: src/protocols/silc/ops.c:433
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
+
+#: src/protocols/silc/ops.c:437
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
+
+#: src/protocols/silc/ops.c:464
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
+
+#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "您被 %s 從網路上移除 (%s)"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "被 %s 從網路上移除 (%s)"
+
+#  XXX 要核實
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "從伺服器登出"
+
+#: src/protocols/silc/ops.c:767
+msgid ""
+"Personal Information:\n"
+"\n"
+msgstr ""
+"個人資訊:\n"
+"\n"
+
+#: src/protocols/silc/ops.c:769
+#, c-format
+msgid "Full Name:\t\t%s\n"
+msgstr "全名:   \t%s\n"
+
+#: src/protocols/silc/ops.c:772
+#, c-format
+msgid "First Name:\t%s\n"
+msgstr "名:    \t%s\n"
+
+# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
+# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
+#: src/protocols/silc/ops.c:775
+#, c-format
+msgid "Middle Names:\t%s\n"
+msgstr "英文別名: \t%s\n"
+
+#: src/protocols/silc/ops.c:778
+#, c-format
+msgid "Family Name:\t%s\n"
+msgstr "姓:    \t%s\n"
+
+#: src/protocols/silc/ops.c:781 src/protocols/silc/ops.c:911
+#, c-format
+msgid "Nickname:\t\t%s\n"
+msgstr "暱稱:   \t%s\n"
+
+#: src/protocols/silc/ops.c:784
+#, c-format
+msgid "Birth Day:\t\t%s\n"
+msgstr "生日:   \t%s\n"
+
+#: src/protocols/silc/ops.c:787
+#, c-format
+msgid "Job Title:\t\t%s\n"
+msgstr "職銜:   \t%s\n"
+
+#: src/protocols/silc/ops.c:790
+#, c-format
+msgid "Job Role:\t\t%s\n"
+msgstr "職責:   \t%s\n"
+
+#: src/protocols/silc/ops.c:793
+#, c-format
+msgid "Organization:\t%s\n"
+msgstr "所屬機構: \t%s\n"
+
+#: src/protocols/silc/ops.c:796
+#, c-format
+msgid "Unit:\t\t%s\n"
+msgstr "部門:   \t%s\n"
+
+#: src/protocols/silc/ops.c:799
+#, c-format
+msgid "Homepage:\t%s\n"
+msgstr "網頁:   \t%s\n"
+
+#: src/protocols/silc/ops.c:802
+#, c-format
+msgid "Address:\t%s\n"
+msgstr "地址:   \t%s\n"
+
+#: src/protocols/silc/ops.c:806
+#, c-format
+msgid "Tel:\t\t\t%s\n"
+msgstr "電話:   \t%s\n"
+
+#: src/protocols/silc/ops.c:811
+#, c-format
+msgid "EMail:\t\t%s\n"
+msgstr "電子郵件: \t%s\n"
+
+#: src/protocols/silc/ops.c:815
+#, c-format
+msgid ""
+"\n"
+"Note:\t\t%s\n"
+msgstr ""
+"\n"
+"備註:   \t%s\n"
+
+#: src/protocols/silc/ops.c:862
+msgid "Join Chat"
+msgstr "加入聊天室"
+
+#: src/protocols/silc/ops.c:913
+#, c-format
+msgid "Real Name:\t%s\n"
+msgstr "姓名:   \t%s\n"
+
+#: src/protocols/silc/ops.c:915
+#, c-format
+msgid "Username:\t\t%s\n"
+msgstr "使用者名稱:\t%s\n"
+
+#: src/protocols/silc/ops.c:917
+#, c-format
+msgid "Hostname:\t\t%s\n"
+msgstr "主機名稱: \t%s\n"
+
+#: src/protocols/silc/ops.c:919
+#, c-format
+msgid "Server:\t\t%s\n"
+msgstr "伺服器:  \t%s\n"
+
+#: src/protocols/silc/ops.c:924
+#, c-format
+msgid "User Mode:\t%s\n"
+msgstr "使用者模式:\t%s\n"
+
+#: src/protocols/silc/ops.c:938
+msgid ""
+"\n"
+"Channels:\n"
+msgstr ""
+"\n"
+"頻道:\n"
+
+#: src/protocols/silc/ops.c:965
+#, c-format
+msgid ""
+"\n"
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"\n"
+"公鑰指紋:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/ops.c:966
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"公鑰 Babbleprint:\n"
+"%s"
+
+#: src/protocols/silc/ops.c:979
+msgid "More..."
+msgstr "顯示細節..."
+
+#: src/protocols/silc/ops.c:990 src/protocols/silc/silc.c:744
+msgid "Detach From Server"
+msgstr "與伺服器暫停連線"
+
+#: src/protocols/silc/ops.c:990
+msgid "Cannot detach"
+msgstr "無法暫停連線"
+
+#: src/protocols/silc/ops.c:1001
+msgid "Cannot set topic"
+msgstr "無法設定主題"
+
+#: src/protocols/silc/ops.c:1029
+msgid "Roomlist"
+msgstr "聊天室清單"
+
+#: src/protocols/silc/ops.c:1029
+msgid "Cannot get room list"
+msgstr "無法取得聊天室清單"
+
+#: src/protocols/silc/ops.c:1077
+msgid "No public key was received"
+msgstr "沒有收到公鑰"
+
+#: src/protocols/silc/ops.c:1090 src/protocols/silc/ops.c:1103
+#: src/protocols/silc/ops.c:1104
+msgid "Server Information"
+msgstr "伺服器資訊"
+
+#: src/protocols/silc/ops.c:1091
+msgid "Cannot get server information"
+msgstr "無法取得伺服器資訊"
+
+#: src/protocols/silc/ops.c:1112
+msgid "Could not kill user"
+msgstr "無法傱網路上移除使用者"
+
+#: src/protocols/silc/ops.c:1189
+msgid "Error during connecting to SILC Server"
+msgstr "連線至 SILC 伺服器時發生錯誤"
+
+#: src/protocols/silc/ops.c:1194
+msgid "Key Exchange failed"
+msgstr "密鑰交換失敗"
+
+#: src/protocols/silc/ops.c:1203
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
+
+#: src/protocols/silc/ops.c:1209
+msgid "Connection timeout"
+msgstr "連線已逾時"
+
+#: src/protocols/silc/ops.c:1238
+msgid "Disconnected by server"
+msgstr "伺服器中斷了連線"
+
+#: src/protocols/silc/ops.c:1298 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "恢復工作階段中"
+
+#: src/protocols/silc/ops.c:1300
+msgid "Authenticating connection"
+msgstr "驗證連線中"
+
+#: src/protocols/silc/ops.c:1347
+msgid "Verifying server public key"
+msgstr "核實伺服器的公鑰中"
+
+#: src/protocols/silc/ops.c:1388
+msgid "Passphrase required"
+msgstr "必須輸入密碼"
+
+#: src/protocols/silc/ops.c:1417
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "失敗:版本不符,請更新您的客戶端程式"
+
+#: src/protocols/silc/ops.c:1420
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "失敗:遠端不信任/不支援您的公鑰"
+
+#: src/protocols/silc/ops.c:1423
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
+
+#: src/protocols/silc/ops.c:1426
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
+
+#: src/protocols/silc/ops.c:1429
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "失敗:遠端不支援建議中的 PKCS"
+
+#: src/protocols/silc/ops.c:1432
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
+
+#: src/protocols/silc/ops.c:1435
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "失敗:遠端不支援建議中的 HMAC"
+
+#: src/protocols/silc/ops.c:1437
+msgid "Failure: Incorrect signature"
+msgstr "失敗:錯誤的簽章"
+
+#: src/protocols/silc/ops.c:1439
+msgid "Failure: Invalid cookie"
+msgstr "失敗:無效的 Cookie"
+
+#: src/protocols/silc/ops.c:1450
+msgid "Failure: Authentication failed"
+msgstr "失敗:認證失敗"
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。接受這個公鑰嗎?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "收到 %s 的公鑰,接受這個公鑰嗎?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s 的公鑰的指紋及 babbleprint 為:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "核實公鑰"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "檢視..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "不支援的公鑰類型"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "連線失敗"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "無法初始化 SILC 的客戶端連線"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "交換密鑰中"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "記憶體不夠"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "連線至 SILC 伺服器中"
+
+#: src/protocols/silc/silc.c:601
+msgid "Your Current Mood"
+msgstr "您目前的心情"
+
+#: src/protocols/silc/silc.c:603
+msgid "Normal"
+msgstr "正常"
+
+#: src/protocols/silc/silc.c:628
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"聯絡方法"
+
+#: src/protocols/silc/silc.c:636
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:638
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:640
+msgid "Video Conferencing"
+msgstr "視像會議"
+
+#: src/protocols/silc/silc.c:645
+msgid "Your Current Status"
+msgstr "目前狀態"
+
+#: src/protocols/silc/silc.c:652
+#, fuzzy
+msgid "Online Services"
+msgstr "上線自"
+
+#: src/protocols/silc/silc.c:655
+msgid "Let others see what services you are using"
+msgstr ""
+
+#  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
+#: src/protocols/silc/silc.c:661
+msgid "Let others see what computer you are using"
+msgstr "容許別人查看您用的是什麼電腦"
+
+#: src/protocols/silc/silc.c:668
+msgid "Your VCard File"
+msgstr "您的 VCard 檔案"
+
+#: src/protocols/silc/silc.c:673 src/protocols/silc/silc.c:675
+msgid "Timezone"
+msgstr "時區"
+
+#  XXX 好像很怪
+#: src/protocols/silc/silc.c:681 src/protocols/silc/silc.c:682
+msgid "User Online Status Attributes"
+msgstr "使用者上線狀態屬性"
+
+#: src/protocols/silc/silc.c:683
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
+"人看得見的各項。"
+
+#: src/protocols/silc/silc.c:720
+msgid "Message of the Day"
+msgstr "是日訊息"
+
+#: src/protocols/silc/silc.c:720
+msgid "No Message of the Day available"
+msgstr "沒有是日訊息"
+
+#: src/protocols/silc/silc.c:721
+msgid "There is no Message of the Day associated with this connection"
+msgstr "這個連結沒有相關的是日訊息"
+
+#: src/protocols/silc/silc.c:737
+msgid "Online Status"
+msgstr "上線狀態"
+
+#: src/protocols/silc/silc.c:750
+msgid "View Message of the Day"
+msgstr "顯示是日訊息 (MOTD)"
+
+#: src/protocols/silc/silc.c:815
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "使用者 <I>%s</I> 不在網路上"
+
+#: src/protocols/silc/silc.c:895
+msgid "Instant Messages"
+msgstr "即時訊息"
+
+#: src/protocols/silc/silc.c:900
+msgid "Digitally sign all IM messages"
+msgstr "數位簽署所有即時訊息"
+
+#: src/protocols/silc/silc.c:905
+msgid "Verify all IM message signatures"
+msgstr "核實所有即時訊息的簽章"
+
+#: src/protocols/silc/silc.c:908
+msgid "Channel Messages"
+msgstr "頻道訊息"
+
+#: src/protocols/silc/silc.c:913
+msgid "Digitally sign all channel messages"
+msgstr "數位簽署所有頻道訊息"
+
+#: src/protocols/silc/silc.c:918
+msgid "Verify all channel message signatures"
+msgstr "核實所有頻道訊息的簽章"
+
+#: src/protocols/silc/silc.c:921
+msgid "Default SILC Key Pair"
+msgstr "預設的 SILC Key Pair"
+
+#: src/protocols/silc/silc.c:926
+msgid "SILC Public Key"
+msgstr "SILC 公鑰"
+
+#: src/protocols/silc/silc.c:931
+msgid "SILC Private Key"
+msgstr "SILC 私鑰"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1016
+msgid "SILC Protocol Plugin"
+msgstr "SILC 協定模組"
+
+#. *  description
+#: src/protocols/silc/silc.c:1018
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "安全性網際網路即時會議 (SILC) 協定"
+
+#  XXX
+#: src/protocols/silc/silc.c:1047
+msgid "Public key authentication"
+msgstr "使用公鑰認證"
+
+#: src/protocols/silc/silc.c:1053
+msgid "Public Key File"
+msgstr "公鑰檔案"
+
+#: src/protocols/silc/silc.c:1057
+msgid "Private Key File"
+msgstr "私鑰檔案"
+
+#  TODO 譯文有待改進,這是意譯
+#: src/protocols/silc/silc.c:1062
+msgid "Reject watching by other users"
+msgstr "拒絕伺服器端的好友狀態捕捉"
+
+#: src/protocols/silc/silc.c:1065
+msgid "Block invites"
+msgstr "拒絕邀請"
+
+#  XXX 好像聽來很怪
+#: src/protocols/silc/silc.c:1068
+msgid "Block IMs without Key Exchange"
+msgstr "拒絕沒有交換密鑰的即時訊息"
+
+#: src/protocols/silc/silc.c:1071
+msgid "Reject online status attribute requests"
+msgstr "拒絕上線狀態屬性要求"
+
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+msgid "Creating SILC key pair..."
+msgstr "建立 SILC key pair 中..."
+
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+msgid "Public Key Information"
+msgstr "公鑰資訊"
+
 #: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
@@ -8124,10 +9157,11 @@
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
+#  NOTE 譯文更動 by Ambrose
 #: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr "警告:%s 是不被允許的。"
+msgstr "不允許對 %s 發出警告。"
 
 #: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
@@ -8249,44 +9283,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1671
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1707
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1752 src/protocols/toc/toc.c:1792
+#: src/protocols/toc/toc.c:1916 src/protocols/toc/toc.c:2004
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1949
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2049
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2090
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -8301,16 +9335,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2172 src/protocols/toc/toc.c:2174
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -8397,8 +9430,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1280 src/protocols/trepia/trepia.c:1282
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
@@ -8633,28 +9665,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3311
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
+#: src/protocols/yahoo/yahoo.c:3314
+msgid "Pager port"
+msgstr "傳呼系統通訊埠"
+
 #: src/protocols/yahoo/yahoo.c:3317
-msgid "Pager port"
-msgstr "傳呼系統通訊埠"
-
-#: src/protocols/yahoo/yahoo.c:3320
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3320
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3323
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
@@ -8723,41 +9754,41 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
+#: src/protocols/zephyr/zephyr.c:560
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
 
 # NOTE 這是法文po檔所用的處理方法,我認為比較清楚
-#: src/protocols/zephyr/zephyr.c:1164
+#: src/protocols/zephyr/zephyr.c:1165
 msgid "ZLocate"
 msgstr "名錄搜尋 (ZLocate)"
 
@@ -8766,18 +9797,18 @@
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
 # 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:1206
+#: src/protocols/zephyr/zephyr.c:1207
 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:1212
+#: src/protocols/zephyr/zephyr.c:1213
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1219
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
@@ -8791,8 +9822,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1371 src/protocols/zephyr/zephyr.c:1373
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -8802,36 +9832,37 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1390
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1393
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1396
 msgid "Exposure"
 msgstr "現身程度"
 
 #. Forbidden
-#: src/proxy.c:955
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "拒絕存取:Proxy 伺服器禁止通訊埠 80 的資料傳送。"
-
-#: src/proxy.c:957
+#: src/proxy.c:853
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "拒絕存取:Proxy 伺服器禁止通訊埠 %d 的資料傳送。"
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理伺服器連線錯誤 %d"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: src/proxy.c:1696
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8846,66 +9877,66 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1250
+#: src/request.h:1252
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:962
+#: src/server.c:914
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:976
+#: src/server.c:928
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1108 src/server.c:1118
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1184
+#: src/server.c:1131
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1200
+#: src/server.c:1147
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1202
+#: src/server.c:1149
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1217
+#: src/server.c:1164
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/server.c:1231
+#: src/server.c:1178
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1189 src/server.c:1197
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1267
+#: src/server.c:1211
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1317
+#: src/server.c:1261
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8914,11 +9945,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1264
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1430
+#: src/server.c:1374
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8927,12 +9958,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1378
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1440
+#: src/server.c:1384
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -8959,33 +9990,33 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2040
+#: src/util.c:2120
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2043
+#: src/util.c:2123
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2154 src/util.c:2159 src/util.c:2164 src/util.c:2167
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2155 src/util.c:2159 src/util.c:2173 src/util.c:2175
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2155 src/util.c:2164 src/util.c:2173 src/util.c:2178
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2430
+#: src/util.c:2515
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -9000,3 +10031,169 @@
 #: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "通知"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "忽略顏色(_O)"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "忽略字體(_F)"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "忽略字體大小(_Z)"
+
+#~ msgid "Buddy List Toolbar"
+#~ msgstr "好友清單工具列"
+
+#~ msgid "Group Display"
+#~ msgstr "群組顯示"
+
+#~ msgid "Show _numbers in groups"
+#~ msgstr "顯示群組裡的好友/聊天室數目(_N)"
+
+#~ msgid "Show status _icons on tabs"
+#~ msgstr "在標籤上顯示好友狀態(_I)"
+
+#~ msgid "Sounds when you _log in"
+#~ msgstr "登入時發出音效(_L)"
+
+#~ msgid "Seconds before _resending:"
+#~ msgstr "送出回覆前的等待秒數(_R):"
+
+#~ msgid "Send auto-response in _active conversations"
+#~ msgstr "目前進行的交談也要送出自動回應(_A)"
+
+#~ msgid "New window _width:"
+#~ msgstr "新視窗寬度(_W):"
+
+#~ msgid "New window _height:"
+#~ msgstr "新視窗高度(_H):"
+
+#~ msgid "_Entry field height:"
+#~ msgstr "輸入欄高度(_E):"
+
+#~ msgid "Tab Completion"
+#~ msgstr "Tab Completion"
+
+#~ msgid "_Tab-complete nicks"
+#~ msgstr "使用 Tab 鍵幫助輸入暱稱(_T)"
+
+#~ msgid "_Old-style tab completion"
+#~ msgstr "舊式 Tab Completion (_O)"
+
+#~ msgid "_Sending messages removes away status"
+#~ msgstr "送出訊息時取消離開狀態(_S)"
+
+#~ msgid ""
+#~ "You are not currently signed on with any protocols that have the ability "
+#~ "to list rooms."
+#~ msgstr "您並未登入任何一個可供您列出聊天室的通訊協定。"
+
+#~ msgid "Warning: Passwords are stored in plain text!"
+#~ msgstr "警告:密碼將以明文形式儲存!"
+
+#~ msgid "<b>Screen Name:</b>"
+#~ msgstr "<b>帳號:</b>"
+
+#~ msgid "Sign on"
+#~ msgstr "登入"
+
+#~ msgid "AIM Screen name"
+#~ msgstr "AIM 帳號"
+
+#~ msgid "User"
+#~ msgstr "使用者"
+
+#~ msgid "Preparing Buddy List"
+#~ msgstr "預備好友清單中"
+
+#~ msgid "Unable to login to rendezvous"
+#~ msgstr "無法登入到 Rendezvous"
+
+#~ msgid "Rendezvous Protocol Plugin"
+#~ msgstr "Rendezvous 協定模組"
+
+#~ msgid "Host name"
+#~ msgstr "主機名稱"
+
+#~ msgid "First name"
+#~ msgstr "名"
+
+#~ msgid "Last name"
+#~ msgstr "姓"
+
+#~ msgid "Share AIM screen name"
+#~ msgstr "公開您的 AIM 帳號"
+
+#  FIXME weirdness
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "/Tools/P_rotocol Actions"
+#~ msgstr "/工具/通訊協定相關設定(_R)"
+
+#~ msgid "/Tools/Protocol Actions"
+#~ msgstr "/工具/通訊協定相關設定"
+
+#~ msgid "Style"
+#~ msgstr "風格"
+
+#~ msgid "_Bold"
+#~ msgstr "粗體(_B)"
+
+#~ msgid "_Italic"
+#~ msgstr "斜體(_I)"
+
+#~ msgid "_Underline"
+#~ msgstr "底線(_U)"
+
+#~ msgid "_Strikethrough"
+#~ msgstr "刪除的文字(_S)"
+
+#~ msgid "Face"
+#~ msgstr "字體"
+
+#~ msgid "Use custo_m face"
+#~ msgstr "使用者自定字體(_M)"
+
+#~ msgid "Use custom si_ze"
+#~ msgstr "使用者自定字體大小(_Z)"
+
+#~ msgid "Color"
+#~ msgstr "顏色"
+
+#~ msgid "_Text color"
+#~ msgstr "文字顏色(_T)"
+
+#~ msgid "Bac_kground color"
+#~ msgstr "背景顏色(_K)"
+
+#~ msgid "Show graphical _smileys"
+#~ msgstr "顯示表情(_S)"
+
+#~ msgid "Show _URLs as links"
+#~ msgstr "顯示 URL 為超連結(_U)"
+
+#~ msgid "Send _URLs as links"
+#~ msgstr "送出 URL 為超連結(_U)"
+
+#~ msgid "Hide window on _send"
+#~ msgstr "送出訊息後關閉視窗(_S)"
+
+#~ msgid "Show _logins in window"
+#~ msgstr "在視窗中顯示登入訊息(_L)"
+
+#~ msgid "Unable to send password"
+#~ msgstr "無法送出密碼"
+
+#~ msgid "IO Error."
+#~ msgstr "IO 錯誤。"
+
+#~ msgid ""
+#~ "<b>Status:</b> %s\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "<b>狀態:</b>%s\n"
+#~ "<b>訊息:</b>%s"
+
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>狀態:</b>%s"