changeset 9856:fdf71e2f31ac

[gaim-migrate @ 10735] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 25 Aug 2004 01:28:06 +0000
parents b23e6f9c4d2e
children d326dd512662
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 1989 insertions(+), 1903 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Aug 24 23:32:15 2004 +0000
+++ b/po/ChangeLog	Wed Aug 25 01:28:06 2004 +0000
@@ -2,6 +2,7 @@
 
 version 0.82cvs:
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (British) translation updated (Luke Ross (lukeross))
--- a/po/zh_TW.po	Tue Aug 24 23:32:15 2004 +0000
+++ b/po/zh_TW.po	Wed Aug 25 01:28:06 2004 +0000
@@ -3,6 +3,7 @@
 # Copyright (C) 2003-2004, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
+# $InternalId: zh_TW.po,v 1.306 2004/08/24 23:12:08 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -41,9 +42,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.81cvs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-14 22:11-0400\n"
+"Project-Id-Version: Gaim 0.82\n"
+"POT-Creation-Date: 2004-08-23 11:53-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -98,52 +98,51 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
-#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
 msgid "Mail Server"
 msgstr "郵件伺服器"
 
-#: plugins/chkmail.c:132
+#: plugins/chkmail.c:136
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s(%d 封新郵件 / 共 %d 封郵件)"
 
-#: plugins/chkmail.c:195
+#: plugins/chkmail.c:199
 msgid "Check Mail"
 msgstr "檢查信箱"
 
-#: plugins/chkmail.c:199
+#: plugins/chkmail.c:203
 msgid "Check email every X seconds.\n"
 msgstr "每隔 X 秒檢查一次信箱。\n"
 
-#: plugins/contact_priority.c:82
+#: plugins/contact_priority.c:83
 msgid "Point values to use when..."
 msgstr "個別好友狀態的得分值:"
 
-#: plugins/contact_priority.c:91
+#: plugins/contact_priority.c:92
 msgid "Buddy is offline:"
 msgstr "好友離線:"
 
-#: plugins/contact_priority.c:105
+#: plugins/contact_priority.c:106
 msgid "Buddy is away:"
 msgstr "好友離開:"
 
-#: plugins/contact_priority.c:119
+#: plugins/contact_priority.c:120
 msgid "Buddy is idle:"
 msgstr "好友閒置:"
 
 # NOTE 譯文核實 by Etan Reisner (開發者之一)
-#: plugins/contact_priority.c:133
+#: plugins/contact_priority.c:134
 msgid "Use last matching buddy"
 msgstr "使用最後(而非最先)一個匹配的好友帳號"
 
 # NOTE 每行不可太長,並要人手用「\n」分隔,否則視窗會過闊
 #. Explanation
-#: plugins/contact_priority.c:139
+#: plugins/contact_priority.c:140
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -158,7 +157,7 @@
 "要得出預設的優先次序「沒閒置→閒置→離開→離開兼閒置」,\n"
 "使用上列的預設值即可。"
 
-#: plugins/contact_priority.c:142
+#: plugins/contact_priority.c:143
 msgid "Point values to use for Account..."
 msgstr "個別帳號的得分值:"
 
@@ -169,20 +168,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:191
+#: plugins/contact_priority.c:192
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:194
+#: plugins/contact_priority.c:195
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: plugins/contact_priority.c:196
+#: plugins/contact_priority.c:197
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -205,69 +204,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:115 src/gtkaccount.c:737 src/gtkaccount.c:2158
+#: plugins/docklet/docklet.c:133 src/gtkaccount.c:738 src/gtkaccount.c:2160
 msgid "Auto-login"
 msgstr "自動登入"
 
-#: plugins/docklet/docklet.c:118
+#: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: plugins/docklet/docklet.c:119
+#: plugins/docklet/docklet.c:137
 msgid "Join A Chat..."
 msgstr "加入聊天室..."
 
-#: plugins/docklet/docklet.c:150
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:154 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:180 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2770
-#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2939
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6502 src/protocols/oscar/oscar.c:6702
+#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2795
+#: src/protocols/novell/novell.c:2912 src/protocols/novell/novell.c:2964
+#: src/protocols/oscar/oscar.c:648 src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:6558 src/protocols/oscar/oscar.c:6758
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "離開"
 
 #. else...
-#: plugins/docklet/docklet.c:160 src/away.c:570
-#: src/protocols/oscar/oscar.c:5414 src/protocols/oscar/oscar.c:6710
+#: plugins/docklet/docklet.c:186 src/away.c:583
+#: src/protocols/oscar/oscar.c:5488 src/protocols/oscar/oscar.c:6766
 msgid "Back"
 msgstr "返回"
 
-#: plugins/docklet/docklet.c:168
+#: plugins/docklet/docklet.c:194
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:173 src/gtkft.c:612
+#: plugins/docklet/docklet.c:199 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: plugins/docklet/docklet.c:174 src/gtkaccount.c:2339
+#: plugins/docklet/docklet.c:200 src/gtkaccount.c:2341
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:175 src/gtkprefs.c:2484
+#: plugins/docklet/docklet.c:201 src/gtkprefs.c:2506
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: plugins/docklet/docklet.c:184
+#: plugins/docklet/docklet.c:210
 msgid "Signoff"
 msgstr "登出"
 
-#: plugins/docklet/docklet.c:188
+#: plugins/docklet/docklet.c:214
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:479
+#: plugins/docklet/docklet.c:505
 msgid "Tray Icon Configuration"
 msgstr "工作匣圖示設定"
 
-#: plugins/docklet/docklet.c:483
+#: plugins/docklet/docklet.c:509
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "隱藏新訊息直到工作匣圖示被點擊(_H)"
 
@@ -278,20 +277,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:507
+#: plugins/docklet/docklet.c:533
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:536
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
 # NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:512
+#: plugins/docklet/docklet.c:538
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -302,20 +301,20 @@
 "快速的操作 Gaim 的幾項常用功能(包括開啟或關閉好友清單或登入視窗);並讓您可"
 "以選擇將收到的訊息存到佇列中,直到工作匣圖示被點擊,如同使用 ICQ 一樣。"
 
-#: plugins/extplacement.c:75
+#: plugins/extplacement.c:76
 msgid "By conversation count"
 msgstr "依交談個數"
 
-#: plugins/extplacement.c:96
+#: plugins/extplacement.c:97
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: plugins/extplacement.c:101
+#: plugins/extplacement.c:102
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文!
-#: plugins/extplacement.c:107
+#: plugins/extplacement.c:108
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
 
@@ -326,20 +325,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:126
+#: plugins/extplacement.c:127
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:128
+#: plugins/extplacement.c:129
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:130
+#: plugins/extplacement.c:131
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -359,7 +358,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。"
@@ -508,66 +506,66 @@
 #  NOTE 以下「Address book」及「Person」乃對應 evolution PO 檔之譯法,見
 #  NOTE http://developer.gnome.org/projects/gtp/status/gnome-2.6/PO/evolution.HEAD.zh_TW.po
 #  NOTE 譯文更動 by Ambrose
-#: plugins/gevolution/add_buddy_dialog.c:133
-#: plugins/gevolution/assoc-buddy.c:71
+#: plugins/gevolution/add_buddy_dialog.c:134
+#: plugins/gevolution/assoc-buddy.c:72
 msgid "Local Addressbook"
 msgstr "本地端目錄服務"
 
-#: plugins/gevolution/add_buddy_dialog.c:143
-#: plugins/gevolution/add_buddy_dialog.c:154
-#: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3003 src/gtkprefs.c:956 src/gtkprefs.c:1008
-#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
+#: plugins/gevolution/add_buddy_dialog.c:144
+#: plugins/gevolution/add_buddy_dialog.c:155
+#: plugins/gevolution/assoc-buddy.c:82 plugins/gevolution/assoc-buddy.c:93
+#: src/gtkblist.c:2998 src/gtkprefs.c:959 src/gtkprefs.c:1011
+#: src/gtkprefs.c:1823 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
-#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/add_buddy_dialog.c:188
+#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2164
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
 
 #  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
 #  NOTE 譯文更動 by Ambrose
-#: plugins/gevolution/add_buddy_dialog.c:198
+#: plugins/gevolution/add_buddy_dialog.c:199
 msgid "Instant Messaging"
 msgstr "即時傳訊帳號"
 
 #  Add the label.
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:479
+#: plugins/gevolution/add_buddy_dialog.c:480
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6986
+#: plugins/gevolution/add_buddy_dialog.c:493
+#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7042
 msgid "Search"
 msgstr "搜尋"
 
-#: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4042
-#: src/gtkblist.c:4370
+#: plugins/gevolution/add_buddy_dialog.c:564
+#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4038
+#: src/gtkblist.c:4376
 msgid "Group:"
 msgstr "群組:"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:589
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/add_buddy_dialog.c:590
+#: plugins/gevolution/assoc-buddy.c:484
 msgid "New Person"
 msgstr "新增連絡人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:606
+#: plugins/gevolution/add_buddy_dialog.c:607
 msgid "Select Buddy"
 msgstr "選擇好友"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:367
+#: plugins/gevolution/assoc-buddy.c:368
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -577,23 +575,23 @@
 
 # XXX 暫譯
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:446
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Show user details"
 msgstr "顯示使用者細節"
 
 # XXX 暫譯
-#: plugins/gevolution/assoc-buddy.c:447
+#: plugins/gevolution/assoc-buddy.c:448
 msgid "Hide user details"
 msgstr "隱藏使用者細節"
 
 # XXX 暫譯
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:500
+#: plugins/gevolution/assoc-buddy.c:501
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:774 src/blist.c:962 src/blist.c:1898 src/gtkblist.c:3861
+#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:89
+#: src/blist.c:774 src/blist.c:982 src/blist.c:1912 src/gtkblist.c:3857
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -616,7 +614,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "帳號"
 
@@ -637,60 +635,59 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供和 Ximian Evolution 的整合。"
 
-#: plugins/gevolution/new_person_dialog.c:267
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the person's information below."
 msgstr "請在下面輸入這個使用者的資訊。"
 
-#: plugins/gevolution/new_person_dialog.c:271
+#: plugins/gevolution/new_person_dialog.c:272
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "請在下面輸入好友的帳號及其類別。"
 
-#: plugins/gevolution/new_person_dialog.c:291
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Account type:"
 msgstr "帳號類型:"
 
-#: plugins/gevolution/new_person_dialog.c:295
+#: plugins/gevolution/new_person_dialog.c:296
 msgid "Screenname:"
 msgstr "帳號:"
 
 #  NOTE 選擇性資訊
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:315
+#: plugins/gevolution/new_person_dialog.c:316
 msgid "Optional information:"
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:371
-#: src/gtkaccount.c:401 src/protocols/oscar/oscar.c:420
+#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:554
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: plugins/gevolution/new_person_dialog.c:350
+#: plugins/gevolution/new_person_dialog.c:351
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:362
+#: plugins/gevolution/new_person_dialog.c:363
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:382
+#: plugins/gevolution/new_person_dialog.c:383
 msgid "E-mail:"
 msgstr "電子郵件:"
 
-#: plugins/history.c:88
+#: plugins/history.c:89
 msgid "History"
 msgstr "歷史記錄"
 
-#: plugins/history.c:90
+#: plugins/history.c:91
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: plugins/history.c:91
+#: plugins/history.c:92
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -703,15 +700,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:80
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "離開時最小化"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/iconaway.c:83 plugins/iconaway.c:85
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
 
@@ -733,7 +729,7 @@
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:67 src/away.c:905
+#: plugins/idle.c:67 src/away.c:910
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -809,33 +805,33 @@
 msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:600
 msgid "Notify For"
 msgstr "通知種類"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:604
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:611
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:618
 msgid "_Focused windows"
 msgstr "焦點視窗(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:626
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:633
 msgid "Prepend _string into window title:"
 msgstr "加入字串到視窗標題之前(_S):"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:652
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
@@ -843,37 +839,37 @@
 # NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
 # NOTE 譯文更動 by Ambrose
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:660
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "設定視窗的「URGENT」(緊急資訊)提示(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:668
 msgid "Notification Removal"
 msgstr "通知移除"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:673
 msgid "Remove when conversation window _gains focus"
 msgstr "當交談取得輸入焦點時移除通知(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:680
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:688
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:696
 msgid "Remove when a _message gets sent"
 msgstr "送出訊息後移除通知(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:705
 msgid "Remove on switch to conversation ta_b"
 msgstr "當視窗標籤被點選後移除通知(_B)"
 
@@ -884,15 +880,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:792
+#: plugins/notify.c:793
 msgid "Message Notification"
 msgstr "訊息通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/notify.c:795 plugins/notify.c:797
+#: plugins/notify.c:796 plugins/notify.c:798
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
@@ -909,7 +904,6 @@
 
 #. *< name
 #. *< version
-#. *< summary
 #: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
@@ -1001,7 +995,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
@@ -1020,40 +1013,39 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
-#: plugins/spellchk.c:412
+#: plugins/spellchk.c:413
 msgid "Text Replacements"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:436
+#: plugins/spellchk.c:437
 msgid "You type"
 msgstr "當您輸入"
 
-#: plugins/spellchk.c:448
+#: plugins/spellchk.c:449
 msgid "You send"
 msgstr "將會送出"
 
-#: plugins/spellchk.c:474
+#: plugins/spellchk.c:475
 msgid "Add a new text replacement"
 msgstr "加入一個新的文字取代規則"
 
-#: plugins/spellchk.c:481
+#: plugins/spellchk.c:482
 msgid "You _type:"
 msgstr "當您輸入(_T):"
 
-#: plugins/spellchk.c:495
+#: plugins/spellchk.c:496
 msgid "You _send:"
 msgstr "將會送出(_S):"
 
-#: plugins/spellchk.c:535
+#: plugins/spellchk.c:536
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:537 plugins/spellchk.c:538
+#: plugins/spellchk.c:538 plugins/spellchk.c:539
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -1071,7 +1063,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 的支援。"
@@ -1090,7 +1081,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
@@ -1109,7 +1099,6 @@
 #. *< 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。"
@@ -1160,7 +1149,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1189,7 +1177,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 "好友清單的水平捲動版本"
@@ -1224,7 +1211,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
@@ -1249,7 +1235,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:953
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -1287,308 +1273,57 @@
 "\n"
 "* 請注意:這個模組需要 Win2000 或 WinXP 才能產生效果。"
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:343
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime 版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:351
 msgid "Startup"
 msgstr "啟動"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "_Start Gaim on Windows startup"
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3048
-#: src/gtkprefs.c:2394
+#: plugins/win32/winprefs/winprefs.c:361 src/gtkblist.c:3043
+#: src/gtkprefs.c:2416
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:362
 msgid "_Dockable Buddy List"
 msgstr "可停駐的好友清單(_D)"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:366
 msgid "Docked _Buddy List is always on top"
 msgstr "停駐了的好友清單保持在桌面的最上層(_B)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
+#: plugins/win32/winprefs/winprefs.c:376
 msgid "_Keep Buddy List window on top"
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
-#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
+#: plugins/win32/winprefs/winprefs.c:381 src/gtkprefs.c:1004
+#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "交談"
 
-#: plugins/win32/winprefs/winprefs.c:383
+#: plugins/win32/winprefs/winprefs.c:382
 msgid "_Flash Window when messages are received"
 msgstr "收到訊息後閃動視窗(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:405
+#: plugins/win32/winprefs/winprefs.c:404
 msgid "WinGaim Options"
 msgstr "WinGaim 選項"
 
-#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
+#: plugins/win32/winprefs/winprefs.c:406 plugins/win32/winprefs/winprefs.c:407
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: src/about.c:64
-msgid "About Gaim"
-msgstr "關於 Gaim"
-
-#: src/about.c:78
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#: src/about.c:98
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-"Gaim 是一個模組化的訊息程式,同時提供 AIM、ICQ、Yahoo!、MSN、IRC、Jabber、"
-"Napster、Zephyr,以及 Gadu-Gadu 等功能。它是以 GTK+ 開發,並以 GPL 的方式發"
-"佈。<BR><BR>"
-
-# NOTE  contains zh_TW-specific info here!!
-#: src/about.c:109
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
-"SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
-"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
-
-#: src/about.c:114
-msgid "Active Developers"
-msgstr "現任開發者"
-
-#: src/about.c:115
-msgid "maintainer"
-msgstr "維護者"
-
-#: src/about.c:117
-msgid "lead developer"
-msgstr "主要開發者"
-
-#: src/about.c:120
-msgid "developer & webmaster"
-msgstr "開發者兼網站管理員"
-
-#: src/about.c:121
-msgid "win32 port"
-msgstr "Windows 版本移植"
-
-#: src/about.c:124 src/about.c:125 src/about.c:126 src/about.c:127
-msgid "developer"
-msgstr "開發者"
-
-#: src/about.c:128
-msgid "support"
-msgstr "支援"
-
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
-# NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: src/about.c:135
-msgid "Crazy Patch Writers"
-msgstr "狂熱的模組作者"
-
-#: src/about.c:151
-msgid "Retired Developers"
-msgstr "前任開發者"
-
-#: src/about.c:152
-msgid "former libfaim maintainer"
-msgstr "前 libfaim 維護者"
-
-#: src/about.c:153
-msgid "former lead developer"
-msgstr "前主要開發者"
-
-#: src/about.c:156
-msgid "former maintainer"
-msgstr "前維護者"
-
-#: src/about.c:157
-msgid "former Jabber developer"
-msgstr "前 Jabber 開發者"
-
-#: src/about.c:158
-msgid "original author"
-msgstr "原作者"
-
-#: src/about.c:161
-msgid "hacker and designated driver [lazy bum]"
-msgstr "程式編寫者兼指定司機 [懶人]"
-
-#: src/about.c:169
-msgid "Current Translators"
-msgstr "現任譯者"
-
-#: src/about.c:170 src/about.c:209
-msgid "Bulgarian"
-msgstr "保加利亞文"
-
-# NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:171 src/about.c:210
-msgid "Catalan"
-msgstr "加泰隆文"
-
-#: src/about.c:172 src/about.c:211
-msgid "Czech"
-msgstr "捷克文"
-
-#: src/about.c:173
-msgid "Danish"
-msgstr "丹麥文"
-
-#: src/about.c:174
-msgid "British English"
-msgstr "英式英文"
-
-#: src/about.c:175
-msgid "Canadian English"
-msgstr "加拿大式英文"
-
-#: src/about.c:176 src/about.c:212
-msgid "German"
-msgstr "德文"
-
-#: src/about.c:177 src/about.c:213
-msgid "Spanish"
-msgstr "西班牙文"
-
-#: src/about.c:178 src/about.c:214
-msgid "Finnish"
-msgstr "芬蘭文"
-
-#: src/about.c:179 src/about.c:215
-msgid "French"
-msgstr "法文"
-
-#: src/about.c:180
-msgid "Hebrew"
-msgstr "希伯來文"
-
-#: src/about.c:181
-msgid "Hindi"
-msgstr "北印度文"
-
-#: src/about.c:182
-msgid "Hungarian"
-msgstr "匈牙利文"
-
-#  NOTE 港譯「意大利」,臺譯「義大利」。「意」為陰去聲,「義」為陽去聲;
-#  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
-#  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
-#  NOTE【參見「Slovenian」】
-#: src/about.c:183 src/about.c:216
-msgid "Italian"
-msgstr "意大利文"
-
-#: src/about.c:184 src/about.c:217
-msgid "Japanese"
-msgstr "日文"
-
-#: src/about.c:185
-msgid "Lithuanian"
-msgstr "立陶宛文"
-
-#: src/about.c:186 src/about.c:218
-msgid "Korean"
-msgstr "韓文"
-
-# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-# XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:187
-msgid "Dutch; Flemish"
-msgstr "荷蘭文/法蘭德斯文"
-
-#  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:188
-msgid "Macedonian"
-msgstr "馬其頓文"
-
-#: src/about.c:189
-msgid "Norwegian"
-msgstr "挪威文"
-
-#: src/about.c:190 src/about.c:219
-msgid "Polish"
-msgstr "波蘭文"
-
-#: src/about.c:191
-msgid "Portuguese"
-msgstr "標準萄文"
-
-#: src/about.c:192
-msgid "Portuguese-Brazil"
-msgstr "巴西萄文"
-
-#: src/about.c:193
-msgid "Romanian"
-msgstr "羅馬尼亞文"
-
-#: src/about.c:194 src/about.c:220 src/about.c:221
-msgid "Russian"
-msgstr "俄文"
-
-#: src/about.c:195
-msgid "Serbian"
-msgstr "塞爾維亞文"
-
-#  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
-#  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
-#  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
-#  NOTE【參見「Italian」】
-#: src/about.c:196
-msgid "Slovenian"
-msgstr "斯洛維尼亞文"
-
-#: src/about.c:197 src/about.c:223
-msgid "Swedish"
-msgstr "瑞典文"
-
-#: src/about.c:198
-msgid "Vietnamese"
-msgstr "越南文"
-
-#: src/about.c:198
-msgid "and the Gnome-Vi Team"
-msgstr "及 Gnome 越南文翻譯小組之其他組員"
-
-#: src/about.c:199
-msgid "Simplified Chinese"
-msgstr "簡體中文"
-
-#: src/about.c:200
-msgid "Traditional Chinese"
-msgstr "正體中文"
-
-#: src/about.c:207
-msgid "Past Translators"
-msgstr "前任譯者"
-
-# XXX Yahoo譯法
-#: src/about.c:208
-msgid "Amharic"
-msgstr "阿姆哈拉文"
-
-#: src/about.c:222
-msgid "Slovak"
-msgstr "斯洛伐克文"
-
-#: src/about.c:224
-msgid "Chinese"
-msgstr "中文"
-
 #: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
@@ -1622,47 +1357,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2377
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:262 src/gtkdialogs.c:315
-#: src/gtkrequest.c:241 src/protocols/jabber/jabber.c:1048
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2371
+#: src/gtkdialogs.c:384 src/gtkdialogs.c:526 src/gtkdialogs.c:579
+#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1048
 #: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
 #: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
-#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3359
-#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:6773
-#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6917
-#: src/protocols/oscar/oscar.c:7003 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:409
-#: src/protocols/silc/chat.c:447 src/protocols/silc/chat.c:710
-#: src/protocols/silc/ops.c:1072 src/protocols/silc/ops.c:1680
-#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2795
-#: src/protocols/yahoo/yahoo.c:2804 src/request.h:1243
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3472
+#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:6829
+#: src/protocols/oscar/oscar.c:6921 src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7059 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:459 src/protocols/silc/chat.c:722
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1691
+#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2804
+#: src/protocols/yahoo/yahoo.c:2813 src/request.h:1243
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:343 src/account.c:381 src/away.c:353 src/connection.c:199
-#: src/gtkaccount.c:2008 src/gtkaccount.c:2504 src/gtkblist.c:2378
-#: src/gtkblist.c:4408 src/gtkconn.c:168 src/gtkdialogs.c:124
-#: src/gtkdialogs.c:263 src/gtkdialogs.c:316 src/gtkdialogs.c:404
-#: src/gtkdialogs.c:422 src/gtkdialogs.c:440 src/gtkdialogs.c:479
-#: src/gtkdialogs.c:535 src/gtkdialogs.c:581 src/gtkdialogs.c:600
-#: src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585 src/gtkprivacy.c:598
-#: src/gtkprivacy.c:623 src/gtkprivacy.c:634 src/gtkrequest.c:242
+#: src/account.c:343 src/account.c:381 src/away.c:366 src/connection.c:199
+#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2372
+#: src/gtkblist.c:4414 src/gtkconn.c:169 src/gtkdialogs.c:385
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:580 src/gtkdialogs.c:678
+#: src/gtkdialogs.c:700 src/gtkdialogs.c:720 src/gtkdialogs.c:756
+#: src/gtkdialogs.c:816 src/gtkdialogs.c:858 src/gtkdialogs.c:879
+#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
 #: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
-#: src/protocols/jabber/chat.c:702 src/protocols/jabber/jabber.c:667
+#: src/protocols/jabber/chat.c:730 src/protocols/jabber/jabber.c:667
 #: src/protocols/jabber/jabber.c:1049 src/protocols/jabber/xdata.c:338
 #: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
 #: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
-#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1361
-#: src/protocols/oscar/oscar.c:3319 src/protocols/oscar/oscar.c:3360
-#: src/protocols/oscar/oscar.c:3397 src/protocols/oscar/oscar.c:3454
-#: src/protocols/oscar/oscar.c:6774 src/protocols/oscar/oscar.c:6866
-#: src/protocols/oscar/oscar.c:6918 src/protocols/oscar/oscar.c:6987
-#: src/protocols/oscar/oscar.c:7004 src/protocols/silc/buddy.c:461
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1495
+#: src/protocols/oscar/oscar.c:3432 src/protocols/oscar/oscar.c:3473
+#: src/protocols/oscar/oscar.c:3510 src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6922
+#: src/protocols/oscar/oscar.c:6974 src/protocols/oscar/oscar.c:7043
+#: src/protocols/oscar/oscar.c:7060 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:582 src/protocols/silc/chat.c:711
-#: src/protocols/silc/ops.c:1681 src/protocols/silc/silc.c:699
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2796
-#: src/protocols/yahoo/yahoo.c:2805 src/request.h:1243 src/request.h:1253
+#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1692 src/protocols/silc/silc.c:699
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2805
+#: src/protocols/yahoo/yahoo.c:2814 src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
 
@@ -1671,77 +1406,81 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:380 src/gtkrequest.c:248 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
-#: src/account.c:739 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2782
+#: src/account.c:739 src/gtkft.c:158 src/gtkutils.c:591
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2807
 msgid "Unknown"
 msgstr "未知"
 
-#: src/away.c:231
+#: src/away.c:233
 msgid "Away!"
 msgstr "離開!"
 
-#: src/away.c:295
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "修改此訊息"
+
+#: src/away.c:308
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:349
+#: src/away.c:362
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "您確定要移除離開訊息「%s」?"
 
-#: src/away.c:351 src/away.c:442
+#: src/away.c:364 src/away.c:455
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:352 src/gtkconv.c:1378 src/gtkconv.c:3721 src/gtkconv.c:3825
-#: src/gtkrequest.c:247
+#: src/away.c:365 src/gtkconv.c:1400 src/gtkconv.c:3742 src/gtkconv.c:3813
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "移除"
 
-#: src/away.c:422
+#: src/away.c:435
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:638
+#: src/away.c:651
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/away.c:745
+#: src/away.c:758
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/away.c:747
+#: src/away.c:760
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/away.c:757
+#: src/away.c:770
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/away.c:822
+#: src/away.c:835
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/away.c:837
+#: src/away.c:850
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/away.c:893
+#: src/away.c:898
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/away.c:897
+#: src/away.c:902
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: src/away.c:901
+#: src/away.c:906
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -1749,7 +1488,7 @@
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1317
+#: src/blist.c:1337
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1764,18 +1503,18 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1326
+#: src/blist.c:1346
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:2029
+#: src/blist.c:2043
 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:2032
+#: src/blist.c:2046
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1793,9 +1532,9 @@
 msgstr "連線錯誤"
 
 #: src/connection.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for %s (%s)"
-msgstr "輸入 %s 的密碼"
+msgstr "輸入 %s (%s) 的密碼"
 
 #: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
@@ -1863,7 +1602,7 @@
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1377
+#: src/conversation.c:2578 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "新視窗"
 
@@ -1875,26 +1614,58 @@
 msgid "By account"
 msgstr "依帳號"
 
-#: src/ft.c:125
-msgid "That file does not exist."
-msgstr "檔案不存在。"
-
-#: src/ft.c:134
+#: src/ft.c:122
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"讀取 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: src/ft.c:126
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"寫入 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: src/ft.c:130
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"存取 %s 途中發生了錯誤:\n"
+"%s。\n"
+
+#: src/ft.c:161
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/ft.c:194
+#: src/ft.c:171
+msgid "Cannot send a directory."
+msgstr "無法傳送目錄。"
+
+#: src/ft.c:178
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
+
+#: src/ft.c:232
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/ft.c:229
+#: src/ft.c:267
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: src/ft.c:233
+#: src/ft.c:271
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1905,22 +1676,22 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: src/ft.c:285
+#: src/ft.c:322
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:298
-#, c-format
-msgid "%s was not found.\n"
-msgstr "%s 找不到。\n"
-
-#: src/ft.c:927
+#: src/ft.c:898
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s 取消了 %s 的傳送"
+
+#: src/ft.c:948
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "傳送檔案到 %s 被取消。\n"
 
-#: src/ft.c:929
+#: src/ft.c:950
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "由 %s 傳送檔案被取消。\n"
@@ -1933,7 +1704,7 @@
 msgid "Size of the expander arrow"
 msgstr "展開器箭頭大小"
 
-#: src/gaim-remote.c:65
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1960,12 +1731,15 @@
 "       -h, --help [指令]        顯示指令的說明\n"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gaim-remote.c:174 src/gaim-remote.c:190 src/gaim-remote.c:206
-#: src/gaim-remote.c:222
-msgid "Gaim not running (on session 0)\n"
-msgstr "(在工作階段 0)Gaim 未有執行\n"
-
-#: src/gaim-remote.c:236
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"(在工作階段 0)Gaim 未有執行\n"
+"有否載入「遠端控制」模組?\n"
+
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2006,7 +1780,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "提示您加入「Penguin」到您的好友清單中。\n"
 
-#: src/gaim-remote.c:256
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2014,19 +1788,23 @@
 "\n"
 "關閉正在執行的 Gaim\n"
 
-#: src/gaim-remote.c:260
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 msgstr ""
-
-#: src/gaim-remote.c:264
+"\n"
+"使用預設的離開訊息,把全部帳號設定為「離開」狀態。\n"
+
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
 msgstr ""
-
-#: src/gtkaccount.c:324
+"\n"
+"把全部帳號設定為非離開狀態。\n"
+
+#: src/gtkaccount.c:325
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2038,168 +1816,168 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:625
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:641
+#: src/gtkaccount.c:642 src/gtkft.c:555
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:646 src/gtkblist.c:4014
+#: src/gtkaccount.c:647 src/gtkblist.c:4010
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:719
+#: src/gtkaccount.c:720
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:724 src/gtkblist.c:4028 src/gtkblist.c:4356
+#: src/gtkaccount.c:725 src/gtkblist.c:4024 src/gtkblist.c:4362
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:728
+#: src/gtkaccount.c:729
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:784
+#: src/gtkaccount.c:785
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:797
+#: src/gtkaccount.c:798
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:806
+#: src/gtkaccount.c:807
 msgid "Buddy icon:"
 msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:895
+#: src/gtkaccount.c:896
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1031 src/gtkaccount.c:1078
+#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:1037 src/gtkaccount.c:1085
+#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:1043 src/gtkaccount.c:1092
+#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1049 src/gtkaccount.c:1099
+#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1055 src/gtkaccount.c:1106
+#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1061 src/gtkaccount.c:1113 src/gtkprefs.c:1180
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:1152
+#: src/gtkaccount.c:1153
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:1156
+#: src/gtkaccount.c:1157
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:1172
+#: src/gtkaccount.c:1173
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:1190 src/gtkprefs.c:1174
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:1199 src/gtkprefs.c:1201
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:1203 src/gtkprefs.c:1219
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:1211
+#: src/gtkaccount.c:1212
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1584
+#: src/gtkaccount.c:1585
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1586
+#: src/gtkaccount.c:1587
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
-#: src/gtkaccount.c:1610
+#: src/gtkaccount.c:1611
 msgid "Show more options"
 msgstr "顯示細節"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1612
 msgid "Show fewer options"
 msgstr "隱藏細節"
 
 #. Register button
-#: src/gtkaccount.c:1638 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:2003
+#: src/gtkaccount.c:2004
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:2007 src/gtkrequest.c:245
+#: src/gtkaccount.c:2009 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:2121 src/protocols/oscar/oscar.c:4000
+#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4114
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:2145 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5494
-#: src/protocols/oscar/oscar.c:6701 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1362
-#: src/protocols/zephyr/zephyr.c:1374
+#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:6757 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2567 src/protocols/zephyr/zephyr.c:1365
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:2166
+#: src/gtkaccount.c:2168
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2479
+#: src/gtkaccount.c:2481
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
 
-#: src/gtkaccount.c:2493
+#: src/gtkaccount.c:2495
 msgid ""
 "\n"
 "\n"
@@ -2209,47 +1987,47 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2497
+#: src/gtkaccount.c:2499
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2501
+#: src/gtkaccount.c:2503
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2503 src/gtkblist.c:4407 src/gtkconv.c:1380
-#: src/gtkconv.c:3714 src/gtkconv.c:3818 src/gtkrequest.c:246
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3628
-#: src/protocols/silc/chat.c:581
+#: src/gtkaccount.c:2505 src/gtkblist.c:4413 src/gtkconv.c:1402
+#: src/gtkconv.c:3735 src/gtkconv.c:3806 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3741
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:802
+#: src/gtkblist.c:792
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:823
+#: src/gtkblist.c:813
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:834 src/gtkpounce.c:410 src/gtkroomlist.c:353
+#: src/gtkblist.c:824 src/gtkpounce.c:411 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3200
+#: src/gtkblist.c:1119 src/gtkblist.c:3196
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1125 src/gtkblist.c:3190
+#: src/gtkblist.c:1122 src/gtkblist.c:3186
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1130
+#: src/gtkblist.c:1128
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
@@ -2261,12 +2039,12 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
+#: src/gtkblist.c:1145 src/gtkblist.c:1226 src/gtkblist.c:1240
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
-#: src/gtkconn.c:360
+#: src/gtkblist.c:1147 src/gtkblist.c:1228 src/gtkblist.c:1245
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2287,154 +2065,154 @@
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
-#: src/stock.c:87
+#: src/gtkblist.c:1216 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1222
+#: src/gtkblist.c:1218
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1246 src/gtkblist.c:1275
+#: src/gtkblist.c:1242 src/gtkblist.c:1267
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1280
+#: src/gtkblist.c:1272
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:313
+#: src/gtkblist.c:1919 src/gtkconv.c:4378 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2322
+#: src/gtkblist.c:2316
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2317
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2318
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2319
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2320
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2322
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2323
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2325
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2326
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2328
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2329
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2332
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2333
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
+#: src/gtkblist.c:2334
+msgid "/Tools/Buddy _Pounce"
+msgstr "/工具/好友狀態捕捉(_P)"
+
+#: src/gtkblist.c:2335
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具/帳號相關指令(_T)"
+
+#: src/gtkblist.c:2336
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具/模組相關指令(_U)"
+
+#: src/gtkblist.c:2338
+msgid "/Tools/A_ccounts"
+msgstr "/工具/帳號清單(_C)"
+
+#: src/gtkblist.c:2339
+msgid "/Tools/_File Transfers"
+msgstr "/工具/檔案傳輸(_F)"
+
 #: src/gtkblist.c:2340
-msgid "/Tools/Buddy _Pounce"
-msgstr "/工具/好友狀態捕捉(_P)"
+msgid "/Tools/R_oom List"
+msgstr "/工具/聊天室清單(_O)"
 
 #: src/gtkblist.c:2341
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具/帳號相關指令(_T)"
+msgid "/Tools/Pr_eferences"
+msgstr "/工具/偏好設定(_E)"
 
 #: src/gtkblist.c:2342
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/工具/模組相關指令(_U)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具/隱私設定(_I)"
 
 #: src/gtkblist.c:2344
-msgid "/Tools/A_ccounts"
-msgstr "/工具/帳號清單(_C)"
-
-#: src/gtkblist.c:2345
-msgid "/Tools/_File Transfers"
-msgstr "/工具/檔案傳輸(_F)"
-
-#: src/gtkblist.c:2346
-msgid "/Tools/R_oom List"
-msgstr "/工具/聊天室清單(_O)"
-
-#: src/gtkblist.c:2347
-msgid "/Tools/Pr_eferences"
-msgstr "/工具/偏好設定(_E)"
-
-#: src/gtkblist.c:2348
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具/隱私設定(_I)"
-
-#: src/gtkblist.c:2350
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2347
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2348
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2349
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2350
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2369
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:2397
 #, c-format
 msgid ""
 "\n"
@@ -2443,7 +2221,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2461
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2451,12 +2229,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2482
+#: src/gtkblist.c:2476
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2464,7 +2242,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2499
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2472,7 +2250,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2500
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2480,7 +2258,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2501
+#: src/gtkblist.c:2495
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2488,7 +2266,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2496
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2496,7 +2274,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2503
+#: src/gtkblist.c:2497
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2504,7 +2282,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2498
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2512,7 +2290,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2500
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2520,7 +2298,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2528,7 +2306,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2536,108 +2314,108 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2790
+#: src/gtkblist.c:2784
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2792
+#: src/gtkblist.c:2786
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2797
+#: src/gtkblist.c:2791
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2794
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2912
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2915
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2918
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3005
+#: src/gtkblist.c:3000
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gtkblist.c:3006
+#: src/gtkblist.c:3001
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gtkblist.c:3007
+#: src/gtkblist.c:3002
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3068
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3071
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3074
 msgid "/Tools/Account Actions"
 msgstr "/工具/帳號相關指令"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3077
 msgid "/Tools/Plugin Actions"
 msgstr "/工具/模組相關指令"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3170
+#: src/gtkblist.c:3165
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3167
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3192
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
+#: src/gtkblist.c:3202
+msgid "Get information on the selected buddy"
+msgstr "取得被選取好友的資訊"
+
 #: src/gtkblist.c:3206
-msgid "Get information on the selected buddy"
-msgstr "取得被選取好友的資訊"
-
-#: src/gtkblist.c:3210
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3215
+#: src/gtkblist.c:3211
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3220
+#: src/gtkblist.c:3216
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3225
+#: src/gtkblist.c:3221
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3968 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3964 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2734
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3992
+#: src/gtkblist.c:3988
 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. "
@@ -2647,62 +2425,66 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4052 src/gtkblist.c:4336
+#: src/gtkblist.c:4048 src/gtkblist.c:4342
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4275
+msgid "This protocol does not support chat rooms."
+msgstr "這個通訊協定不支援聊天室。"
+
+#: src/gtkblist.c:4291
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4302
+#: src/gtkblist.c:4308
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4326
+#: src/gtkblist.c:4332
 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:4404
+#: src/gtkblist.c:4410
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4405
+#: src/gtkblist.c:4411
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:4972 src/gtkblist.c:5069
+#: src/gtkblist.c:4978 src/gtkblist.c:5075
 msgid "No actions available"
 msgstr "沒有相關指令"
 
-#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "完成。"
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:158
 msgid "Signon: "
 msgstr "登入:"
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:204
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:215
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:360 src/gtkconn.c:592
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
 # XXX 暫譯
-#: src/gtkconn.c:556
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2715,495 +2497,748 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:558
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "理由不明。"
 
-#: src/gtkconn.c:597
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "全部重新連線(_A)"
 
-#: src/gtkconn.c:627
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:314
+#: src/gtkconv.c:327
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我在用 Gaim v%s。"
 
-#: src/gtkconv.c:323
+#: src/gtkconv.c:336
 msgid "Supported debug options are:  version"
-msgstr "支援的除錯選項為:version"
-
-#: src/gtkconv.c:347
+msgstr "支援的除錯選項有:version"
+
+#: src/gtkconv.c:360
 msgid "No such command (in this context)."
-msgstr "(在這個情況下)沒有這個指令"
-
-#: src/gtkconv.c:350
+msgstr "沒有這個指令(可在這裏使用)"
+
+#: src/gtkconv.c:363
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"要獲得某一指令的說明,可輸入「/help &lt;指令&gt;。\n"
-"在這個情況下,可用的指令如下:\n"
-
-#: src/gtkconv.c:434
-msgid ""
-"No such command. If you didn't mean to type a command, you can turn commands "
-"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
-"commands."
-msgstr ""
-"沒有這個指令。假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交談→使用"
-"『斜線』指令」選項停止指令輸入的功能。"
+"要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
+"在這裏,可用的指令有:\n"
+
+#: src/gtkconv.c:435
+msgid "No such command."
+msgstr "無此指令。"
 
 #: src/gtkconv.c:442
-msgid ""
-"Syntax Error:  You typed the wrong number of arguments to that command. If "
-"you didn't mean to type a command, you can turn commands off from Tools-"
-">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr ""
-"語法錯誤:輸入的參數少於指令所需的參數數量。假如你無意輸入指令,你可以透過"
-"「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
-
-#: src/gtkconv.c:449
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
+
+#: src/gtkconv.c:447
 msgid "Your command failed for an unknown reason."
-msgstr "指令的執行因為不明原因失敗。"
-
-#: src/gtkconv.c:456
+msgstr "指令執行失敗,原因不明。"
+
+#: src/gtkconv.c:454
 msgid "That command only works in Chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:457
 msgid "That command only works in IMs, not Chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: src/gtkconv.c:463
+#: src/gtkconv.c:461
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:707
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:713
+#: src/gtkconv.c:735
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:734
+#: src/gtkconv.c:756
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:754
+#: src/gtkconv.c:776
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:791 src/gtkconv.c:2475 src/gtkdebug.c:181
+#: src/gtkconv.c:813 src/gtkconv.c:2497 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: src/gtkconv.c:796
+#: src/gtkconv.c:818
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:832
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: src/gtkconv.c:887 src/gtkdebug.c:130
+#: src/gtkconv.c:909 src/gtkdebug.c:131
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:913 src/gtkdebug.c:158
+#: src/gtkconv.c:935 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1328
+#: src/gtkconv.c:1350
 msgid "IM"
 msgstr "即時訊息"
 
 #. Send File button
-#: src/gtkconv.c:1337 src/gtkconv.c:3707 src/protocols/oscar/oscar.c:435
+#: src/gtkconv.c:1359 src/gtkconv.c:3728 src/protocols/oscar/oscar.c:569
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/gtkconv.c:1346
+#: src/gtkconv.c:1368
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: src/gtkconv.c:1348 src/gtkprefs.c:825
+#: src/gtkconv.c:1370 src/gtkprefs.c:828
 msgid "Ignore"
 msgstr "忽略"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1357 src/gtkconv.c:3728
+#: src/gtkconv.c:1379 src/gtkconv.c:3749
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1366
+#: src/gtkconv.c:1388
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2505
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2526
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: src/gtkconv.c:2534
+#: src/gtkconv.c:2556
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2539
+#: src/gtkconv.c:2561
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2545
+#  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
+#: src/gtkconv.c:2567
 msgid "Save Icon As..."
-msgstr "儲存圖示為..."
-
-#: src/gtkconv.c:2929
+msgstr "儲存圖示..."
+
+#: src/gtkconv.c:2937
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2945
 msgid "User has typed something and paused"
-msgstr "使用者輸入了些東西,不過目前暫停輸入"
+msgstr "使用者開始了輸入,不過暫停了"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3040
+#: src/gtkconv.c:3048
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3499
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3493
-msgid "/Conversation/New Instant _Message..."
-msgstr "/好友/新即時訊息(_M)..."
-
-#: src/gtkconv.c:3498
-msgid "/Conversation/_Find..."
-msgstr "/交談/搜尋(_F)..."
-
-#: src/gtkconv.c:3500
-msgid "/Conversation/View _Log"
-msgstr "/交談/觀看歷史記錄(_L)"
-
 #: src/gtkconv.c:3501
+msgid "/Conversation/New Instant _Message..."
+msgstr "/好友/新即時訊息(_M)..."
+
+#: src/gtkconv.c:3506
+msgid "/Conversation/_Find..."
+msgstr "/交談/搜尋(_F)..."
+
+#: src/gtkconv.c:3508
+msgid "/Conversation/View _Log"
+msgstr "/交談/觀看歷史記錄(_L)"
+
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3511
 msgid "/Conversation/Clear"
 msgstr "/交談/清空"
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3515
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: src/gtkconv.c:3508
+#: src/gtkconv.c:3516
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3514
+#: src/gtkconv.c:3522
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3527
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3529
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3531
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3525
+#: src/gtkconv.c:3533
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3538
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3540
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3545
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3549
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3550
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3543
+#: src/gtkconv.c:3551
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3552
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3545
+#: src/gtkconv.c:3553
 msgid "/Options/Show T_imestamps"
 msgstr "/選項/顯示時間戳記(_I)"
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3595
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3600
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3604
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3602
+#: src/gtkconv.c:3610
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3614
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3618
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3624
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3628
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3632
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3636
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3642
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3646
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3652
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3655
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3658
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3661
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#. From right to left...
-#. Send button
-#: src/gtkconv.c:3677 src/gtkconv.c:3679 src/gtkconv.c:3797 src/gtkconv.c:3799
-msgid "Send"
-msgstr "送出"
-
-#. Now, um, just kind of all over the place. Huh?
+#. The buttons, from left to right
 #. Warn button
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3714
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3696
+#: src/gtkconv.c:3715
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3700 src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkconv.c:3721 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3722
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3710
+#: src/gtkconv.c:3729
 msgid "Send a file to the user"
 msgstr "傳送檔案至使用者"
 
-#: src/gtkconv.c:3717
+#: src/gtkconv.c:3736
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3743
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3731 src/gtkconv.c:4110
+#: src/gtkconv.c:3750 src/gtkconv.c:4085
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
+#. Send button
+#: src/gtkconv.c:3756 src/gtkconv.c:3820
+msgid "Send"
+msgstr "送出"
+
+#: src/gtkconv.c:3757 src/gtkconv.c:3821
+msgid "Send message"
+msgstr "送出訊息"
+
+#. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:3799
 msgid "Invite"
 msgstr "邀請"
 
+#: src/gtkconv.c:3800
+msgid "Invite a user"
+msgstr "邀請使用者"
+
+#: src/gtkconv.c:3807
+msgid "Add the chat to your buddy list"
+msgstr "將這個聊天室加入您的好友清單"
+
 #: src/gtkconv.c:3814
-msgid "Invite a user"
-msgstr "邀請使用者"
-
-#: src/gtkconv.c:3821
-msgid "Add the chat to your buddy list"
-msgstr "將這個聊天室加入您的好友清單"
-
-#: src/gtkconv.c:3828
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3963
+#: src/gtkconv.c:3938
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4026
+#: src/gtkconv.c:4001
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:4087
+#: src/gtkconv.c:4062
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:4099
+#: src/gtkconv.c:4074
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4695
+#: src/gtkconv.c:4668
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:5228 src/gtkconv.c:5257 src/gtkconv.c:5353 src/gtkconv.c:5411
+#: src/gtkconv.c:5201 src/gtkconv.c:5230 src/gtkconv.c:5326 src/gtkconv.c:5384
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5969 src/gtkconv.c:5972
+#: src/gtkconv.c:5942 src/gtkconv.c:5945
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkconv.c:6344
+#: src/gtkconv.c:6317
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
+
+#: src/gtkconv.c:6320
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: src/gtkconv.c:6347
+#: src/gtkconv.c:6323
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
-#: src/gtkconv.c:6351
+#: src/gtkconv.c:6327
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: src/gtkdebug.c:196
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
-#: src/gtkdebug.c:249
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:287
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:293
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:244 src/gtkdialogs.c:296
+#: src/gtkdialogs.c:63
+msgid "maintainer"
+msgstr "維護者"
+
+#: src/gtkdialogs.c:64
+msgid "lead developer"
+msgstr "主要開發者"
+
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "開發者兼網站管理員"
+
+#: src/gtkdialogs.c:66
+msgid "win32 port"
+msgstr "Windows 版本移植"
+
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+msgid "developer"
+msgstr "開發者"
+
+#: src/gtkdialogs.c:71
+msgid "support"
+msgstr "支援"
+
+#: src/gtkdialogs.c:76
+msgid "former libfaim maintainer"
+msgstr "前 libfaim 維護者"
+
+#: src/gtkdialogs.c:77
+msgid "former lead developer"
+msgstr "前主要開發者"
+
+#: src/gtkdialogs.c:78
+msgid "former maintainer"
+msgstr "前維護者"
+
+#: src/gtkdialogs.c:79
+msgid "former Jabber developer"
+msgstr "前 Jabber 開發者"
+
+#: src/gtkdialogs.c:80
+msgid "original author"
+msgstr "原作者"
+
+#: src/gtkdialogs.c:81
+msgid "hacker and designated driver [lazy bum]"
+msgstr "程式編寫者兼指定司機 [懶人]"
+
+# NOTE 寫出來的是「文」,不是「語」;下同 :-)
+#: src/gtkdialogs.c:86 src/gtkdialogs.c:123
+msgid "Bulgarian"
+msgstr "保加利亞文"
+
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+msgid "Catalan"
+msgstr "加泰隆文"
+
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+msgid "Czech"
+msgstr "捷克文"
+
+#: src/gtkdialogs.c:89
+msgid "Danish"
+msgstr "丹麥文"
+
+#: src/gtkdialogs.c:90
+msgid "British English"
+msgstr "英式英文"
+
+#: src/gtkdialogs.c:91
+msgid "Canadian English"
+msgstr "加拿大式英文"
+
+#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+msgid "German"
+msgstr "德文"
+
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+msgid "Spanish"
+msgstr "西班牙文"
+
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+msgid "Finnish"
+msgstr "芬蘭文"
+
+#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+msgid "French"
+msgstr "法文"
+
+#: src/gtkdialogs.c:96
+msgid "Hebrew"
+msgstr "希伯來文"
+
+#: src/gtkdialogs.c:97
+msgid "Hindi"
+msgstr "北印度文"
+
+#: src/gtkdialogs.c:98
+msgid "Hungarian"
+msgstr "匈牙利文"
+
+#  NOTE 港譯「意大利」,臺譯「義大利」。「意」為陰去聲,「義」為陽去聲;
+#  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
+#  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
+#  NOTE【參見「Slovenian」】
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+msgid "Italian"
+msgstr "意大利文"
+
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+msgid "Japanese"
+msgstr "日文"
+
+#: src/gtkdialogs.c:101
+msgid "Lithuanian"
+msgstr "立陶宛文"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+msgid "Korean"
+msgstr "韓文"
+
+# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
+# XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
+#: src/gtkdialogs.c:103
+msgid "Dutch; Flemish"
+msgstr "荷蘭文/法蘭德斯文"
+
+#  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
+#: src/gtkdialogs.c:104
+msgid "Macedonian"
+msgstr "馬其頓文"
+
+#: src/gtkdialogs.c:105
+msgid "Norwegian"
+msgstr "挪威文"
+
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:133
+msgid "Polish"
+msgstr "波蘭文"
+
+#: src/gtkdialogs.c:107
+msgid "Portuguese"
+msgstr "標準萄文"
+
+#: src/gtkdialogs.c:108
+msgid "Portuguese-Brazil"
+msgstr "巴西萄文"
+
+#: src/gtkdialogs.c:109
+msgid "Romanian"
+msgstr "羅馬尼亞文"
+
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+msgid "Russian"
+msgstr "俄文"
+
+#: src/gtkdialogs.c:111
+msgid "Serbian"
+msgstr "塞爾維亞文"
+
+#  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
+#  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
+#  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
+#  NOTE【參見「Italian」】
+#: src/gtkdialogs.c:112
+msgid "Slovenian"
+msgstr "斯洛維尼亞文"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+msgid "Swedish"
+msgstr "瑞典文"
+
+#: src/gtkdialogs.c:114
+msgid "Vietnamese"
+msgstr "越南文"
+
+#: src/gtkdialogs.c:114
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
+
+#: src/gtkdialogs.c:115
+msgid "Simplified Chinese"
+msgstr "簡體中文"
+
+#: src/gtkdialogs.c:116
+msgid "Traditional Chinese"
+msgstr "正體中文"
+
+# XXX Yahoo譯法
+#: src/gtkdialogs.c:122
+msgid "Amharic"
+msgstr "阿姆哈拉文"
+
+#: src/gtkdialogs.c:136
+msgid "Slovak"
+msgstr "斯洛伐克文"
+
+#: src/gtkdialogs.c:138
+msgid "Chinese"
+msgstr "中文"
+
+#: src/gtkdialogs.c:180
+msgid "About Gaim"
+msgstr "關於 Gaim"
+
+#: src/gtkdialogs.c:195
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:216
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"Gaim 是一個模組化的訊息程式,同時提供 AIM、ICQ、Yahoo!、MSN、IRC、Jabber、"
+"Napster、Zephyr,以及 Gadu-Gadu 等功能。它是以 GTK+ 開發,並以 GPL 的方式發"
+"佈。<BR><BR>"
+
+# NOTE  contains zh_TW-specific info here!!
+#: src/gtkdialogs.c:225
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim 頻道<BR><BR><FONT "
+"SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
+"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
+
+#: src/gtkdialogs.c:230
+msgid "Active Developers"
+msgstr "現任開發者"
+
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
+# NOTE 不過,翻成「狂熱的模組作者」會比較好
+#: src/gtkdialogs.c:245
+msgid "Crazy Patch Writers"
+msgstr "狂熱的模組作者"
+
+#: src/gtkdialogs.c:260
+msgid "Retired Developers"
+msgstr "前任開發者"
+
+#: src/gtkdialogs.c:275
+msgid "Current Translators"
+msgstr "現任譯者"
+
+#: src/gtkdialogs.c:295
+msgid "Past Translators"
+msgstr "前任譯者"
+
+#: src/gtkdialogs.c:366 src/gtkdialogs.c:508 src/gtkdialogs.c:560
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:250 src/gtkdialogs.c:302
+#: src/gtkdialogs.c:372 src/gtkdialogs.c:514 src/gtkdialogs.c:566
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:379
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:381
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/gtkdialogs.c:257
+#: src/gtkdialogs.c:521
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:523
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkdialogs.c:310
+#: src/gtkdialogs.c:574
 msgid "Get User Log"
 msgstr "讀取使用者日誌"
 
-#: src/gtkdialogs.c:312
+#: src/gtkdialogs.c:576
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
-#: src/gtkdialogs.c:346
+#: src/gtkdialogs.c:616
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/gtkdialogs.c:365
+#: src/gtkdialogs.c:637
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3215,47 +3250,47 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他(她)將被限制以更嚴格的速率限制。\n"
 
-#: src/gtkdialogs.c:374
+#: src/gtkdialogs.c:646
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/gtkdialogs.c:381
+#: src/gtkdialogs.c:653
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:400
+#: src/gtkdialogs.c:674
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:401
+#: src/gtkdialogs.c:675
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/gtkdialogs.c:403 src/gtkdialogs.c:421 src/gtkdialogs.c:439
-#: src/gtkrequest.c:249 src/protocols/silc/chat.c:572
+#: src/gtkdialogs.c:677 src/gtkdialogs.c:699 src/gtkdialogs.c:719
+#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "別名"
 
-#: src/gtkdialogs.c:417
+#: src/gtkdialogs.c:695
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/gtkdialogs.c:419
+#: src/gtkdialogs.c:697
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
-#: src/gtkdialogs.c:436
+#: src/gtkdialogs.c:716
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/gtkdialogs.c:437
+#: src/gtkdialogs.c:717
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/gtkdialogs.c:474
+#: src/gtkdialogs.c:751
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3265,11 +3300,11 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/gtkdialogs.c:477 src/gtkdialogs.c:478
+#: src/gtkdialogs.c:754 src/gtkdialogs.c:755
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/gtkdialogs.c:530
+#: src/gtkdialogs.c:811
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3277,132 +3312,142 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/gtkdialogs.c:533 src/gtkdialogs.c:534
+#: src/gtkdialogs.c:814 src/gtkdialogs.c:815
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/gtkdialogs.c:577
+#: src/gtkdialogs.c:853
 #, 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/gtkdialogs.c:579 src/gtkdialogs.c:580
+#: src/gtkdialogs.c:856 src/gtkdialogs.c:857
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/gtkdialogs.c:596
+#: src/gtkdialogs.c:873
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/gtkdialogs.c:598 src/gtkdialogs.c:599
+#: src/gtkdialogs.c:877 src/gtkdialogs.c:878
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/gtkft.c:136
+#: src/gtkft.c:140
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:962
+#: src/gtkft.c:161 src/gtkft.c:978
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:160 src/gtkft.c:913
+#: src/gtkft.c:164 src/gtkft.c:929
 msgid "Canceled"
 msgstr "已取消"
 
 #  XXX 暫譯
-#: src/gtkft.c:163
+#: src/gtkft.c:167 src/gtkft.c:848
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-#: src/gtkft.c:216
+# XXX 暫譯
+#: src/gtkft.c:220
+msgid "<b>Receiving As:</b>"
+msgstr "<b>以何身分接收:</b>"
+
+#: src/gtkft.c:222
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:219
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
-#: src/gtkft.c:393
+# XXX 暫譯
+#: src/gtkft.c:228
+msgid "<b>Sending As:</b>"
+msgstr "<b>以何身分傳送:</b>"
+
+#: src/gtkft.c:407
 msgid "There is no application configured to open this type of file."
 msgstr "沒有設定任何應用程式可以開啟這類檔案。"
 
-#: src/gtkft.c:398
+#: src/gtkft.c:412
 msgid "An error occurred while opening the file."
 msgstr "開啟檔案途中發生錯誤。"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:524
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:556
 msgid "Filename:"
 msgstr "檔名:"
 
-#: src/gtkft.c:541
+#: src/gtkft.c:557
 msgid "Status:"
 msgstr "狀態:"
 
-#: src/gtkft.c:542
+#: src/gtkft.c:558
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:543
+#: src/gtkft.c:559
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: src/gtkft.c:544
+#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:636
+#: src/gtkft.c:652
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:646
+#: src/gtkft.c:662
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:655
+#: src/gtkft.c:671
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:656
+#: src/gtkft.c:672
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:698 src/stock.c:91
+#: src/gtkft.c:714 src/stock.c:92
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:708
+#: src/gtkft.c:724
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:915
+#: src/gtkft.c:931
 msgid "Failed"
 msgstr "失敗"
 
@@ -3447,108 +3492,108 @@
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2937
+#: src/gtkimhtml.c:2944
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:163
+#: src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/gtkimhtmltoolbar.c:238
+#: src/gtkimhtmltoolbar.c:239
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/gtkimhtmltoolbar.c:311
+#: src/gtkimhtmltoolbar.c:312
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:395
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: src/gtkimhtmltoolbar.c:403
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:405
+#: src/gtkimhtmltoolbar.c:406
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:410
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: src/gtkimhtmltoolbar.c:414
+#: src/gtkimhtmltoolbar.c:415
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:419
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:487
+#: src/gtkimhtmltoolbar.c:488
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:661
+#: src/gtkimhtmltoolbar.c:662
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:676
+#: src/gtkimhtmltoolbar.c:677
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:894
+#: src/gtkimhtmltoolbar.c:895
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:905
+#: src/gtkimhtmltoolbar.c:906
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:917
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:932
+#: src/gtkimhtmltoolbar.c:933
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:944
+#: src/gtkimhtmltoolbar.c:945
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:962
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:973
+#: src/gtkimhtmltoolbar.c:974
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:986
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:1000
+#: src/gtkimhtmltoolbar.c:1001
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:1010
+#: src/gtkimhtmltoolbar.c:1011
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:1021
+#: src/gtkimhtmltoolbar.c:1022
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -3563,24 +3608,24 @@
 msgstr "系統日誌"
 
 #. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">來自:</span> %s\n"
 
-#: src/gtknotify.c:238
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">主題:</span> %s\n"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3591,7 +3636,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:259
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3602,188 +3647,188 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
-#, c-format
-msgid "The browser command \"%s\" is invalid."
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser command <b>%s</b> is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
-#: src/gtknotify.c:569
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:576
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:433 src/gtknotify.c:448
-#, c-format
-msgid "Error launching \"%s\": %s"
+#: src/gtknotify.c:442 src/gtknotify.c:455
+#, c-format
+msgid "Error launching <b>%s</b>: %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:570
+#: src/gtknotify.c:577
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtkpounce.c:129
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:160
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:386 src/gtkpounce.c:888
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:386
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:403
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:430
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:454
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:463
 msgid "Si_gn on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:469
 msgid "_Return from away"
 msgstr "由離開返回(_R)"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "由閒置返回(_N)"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "好友開始輸入(_T)"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "好友停止輸入(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗(_E)"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:525
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "瀏覽(_R)..."
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:528
 msgid "Bro_wse..."
 msgstr "瀏覽(_W)..."
 
-#: src/gtkpounce.c:528
+#: src/gtkpounce.c:529
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:611
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:895
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:953
+#: src/gtkpounce.c:954
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:955
+#: src/gtkpounce.c:956
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: src/gtkpounce.c:957
+#: src/gtkpounce.c:958
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: src/gtkpounce.c:959
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:969
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:446
+#: src/gtkprefs.c:447
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:448
+#: src/gtkprefs.c:449
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:678
 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."
@@ -3791,320 +3836,324 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:718
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
+#: src/gtkprefs.c:725 src/gtkprefs.c:2201 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:721
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:821
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:819
+#: src/gtkprefs.c:822
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:825
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:826
+#: src/gtkprefs.c:829
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:831
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:833
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:836
 msgid "Default Formatting"
 msgstr "預設格式"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:838
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出訊息時使用預設格式化(_S)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:870
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #  XXX 暫譯
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:873
 msgid "_Clear Formatting"
 msgstr "清除格式化(_C)"
 
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:910
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:911
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:913
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:916
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:917
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:920
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:921
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:923
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:939
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:948
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:951 src/gtkprefs.c:1003
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:953 src/gtkprefs.c:1005
+#: src/gtkprefs.c:956 src/gtkprefs.c:1008
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:955 src/gtkprefs.c:1007
+#: src/gtkprefs.c:958 src/gtkprefs.c:1010
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:961
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:964
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:962 src/gtkprefs.c:1020
+#: src/gtkprefs.c:965 src/gtkprefs.c:1027
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:964
+#: src/gtkprefs.c:967
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:969
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:971
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:973
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1017
 msgid "Enable \"_slash\" commands"
 msgstr "使用「斜線」指令(_S)"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1020
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
+
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "顯示格式工具列(_F)"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_A)"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "當事件發生時,將交談視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天室內以不同顏色區別不同的暱稱(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "標籤位置(_L):"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:1067
 msgid "Right"
 msgstr "視窗右側"
 
 # NOTE 不直接翻譯,改依功能呈現的方式翻譯譯文
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "新交談開啟於(_P):"
 
-#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:4860
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:712
+#: src/protocols/oscar/oscar.c:4974
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1128
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1172
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1176
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1294
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/gtkprefs.c:1295
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/gtkprefs.c:1296
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1297
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1298
-msgid "Gnome Default"
-msgstr "GNOME預設值"
-
-#: src/gtkprefs.c:1299
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1300
-msgid "Mozilla"
-msgstr "Mozilla"
-
 #: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1303
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr "GNOME預設值"
+
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1309
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1366
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4113,83 +4162,83 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1445
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1667
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4198,95 +4247,91 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:1745
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1779
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1806
+#: src/gtkprefs.c:1813
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:1815
 msgid "Never"
 msgstr "從不"
 
-#  NOTE 原始碼 (src/server.c) 表示「只要是離開期間」就送出自動回應
-#  NOTE 直譯「只在離開期間」會是個錯誤
-#: src/gtkprefs.c:1809
-#, fuzzy
+#: src/gtkprefs.c:1816
 msgid "When away"
 msgstr "離開期間"
 
-#: src/gtkprefs.c:1810
-#, fuzzy
+#: src/gtkprefs.c:1817
 msgid "When away and idle"
-msgstr "只在同時離開及閒置期間"
-
-#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2776
-#: src/protocols/oscar/oscar.c:4013 src/protocols/yahoo/yahoo.c:2554
+msgstr "離開並且同時閒置期間"
+
+#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2801
+#: src/protocols/oscar/oscar.c:4127 src/protocols/yahoo/yahoo.c:2563
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1814
+#: src/gtkprefs.c:1821
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1824
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1827
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1829
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1830
+#: src/gtkprefs.c:1837
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1831
+#: src/gtkprefs.c:1838
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1835
+#: src/gtkprefs.c:1842
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1843
+#: src/gtkprefs.c:1850
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1912
+#: src/gtkprefs.c:1919
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4301,7 +4346,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1924
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4316,145 +4361,145 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:2150
+#: src/gtkprefs.c:2157
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:2164
+#: src/gtkprefs.c:2171
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:2212
+#: src/gtkprefs.c:2219
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2357
+#: src/gtkprefs.c:2379
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2393
+#: src/gtkprefs.c:2415
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2396
+#: src/gtkprefs.c:2418
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2397
+#: src/gtkprefs.c:2419
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2420
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2399
+#: src/gtkprefs.c:2421
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2400
+#: src/gtkprefs.c:2422
 msgid "Network"
 msgstr "網路"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2425
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2427
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2406
+#: src/gtkprefs.c:2428
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2407
+#: src/gtkprefs.c:2429
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2432
 msgid "Plugins"
 msgstr "模組清單"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:78
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow only the users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:80
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:81
 msgid "Block all users"
 msgstr "拒絕所有使用者"
 
-#: src/gtkprivacy.c:81
+#: src/gtkprivacy.c:82
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:399
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:410
+#: src/gtkprivacy.c:411
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:581
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:582
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:590
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
+#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:620
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:621
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:627
+#: src/gtkprivacy.c:628
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -4462,105 +4507,105 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:239 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1864 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1889 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1890 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "否"
 
-#: src/gtkrequest.c:243
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:244 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: src/gtkroomlist.c:330
+#: src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: src/gtkroomlist.c:401
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "收到訊息"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
 
-#: src/gtksound.c:173
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
 
-#: src/gtksound.c:185
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4571,11 +4616,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:491
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:577
+#: src/log.c:604
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4584,7 +4629,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:579
+#: src/log.c:606
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4594,59 +4639,59 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:630 src/log.c:817
+#: src/log.c:657 src/log.c:787
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:640 src/log.c:829
+#: src/log.c:667 src/log.c:799
 #, 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:677
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:762
+#: src/log.c:732
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:862
+#: src/log.c:803
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:149
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "請建立一個帳號。"
 
-#: src/main.c:231
+#: src/main.c:232
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:247
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>帳號(_A):</b>"
 
-#: src/main.c:261
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>密碼(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:278
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: src/main.c:284
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: src/main.c:290
+#: src/main.c:291
 msgid "_Sign on"
 msgstr "登入(_S)"
 
 #. full help text
-#: src/main.c:516
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4680,16 +4725,16 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:531
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: src/main.c:844
+#: src/main.c:845
 msgid "Unable to load preferences"
 msgstr "無法載入偏好設定"
 
-#: src/main.c:844
+#: src/main.c:845
 msgid ""
 "Gaim was not able to load your preferences because they are stored in an old "
 "format that is no longer used.  Please reconfigure your settings using the "
@@ -4722,10 +4767,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2767
-#: src/protocols/novell/novell.c:2886 src/protocols/novell/novell.c:2937
-#: src/protocols/oscar/oscar.c:600 src/protocols/yahoo/yahoo.c:2894
-#: src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2792
+#: src/protocols/novell/novell.c:2911 src/protocols/novell/novell.c:2962
+#: src/protocols/oscar/oscar.c:734 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3024
 msgid "Available"
 msgstr "上線"
 
@@ -4738,11 +4783,11 @@
 msgstr "離開(只有好友可以看到我)"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:518
-#: src/protocols/oscar/oscar.c:5409 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:5511 src/protocols/oscar/oscar.c:6707
-#: src/protocols/oscar/oscar.c:6712 src/protocols/yahoo/yahoo.c:2552
-#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
+#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:5483 src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:5585 src/protocols/oscar/oscar.c:6763
+#: src/protocols/oscar/oscar.c:6768 src/protocols/yahoo/yahoo.c:2561
+#: src/protocols/yahoo/yahoo.c:2928 src/protocols/yahoo/yahoo.c:3036
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4759,7 +4804,7 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1684
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1709
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
@@ -4786,16 +4831,16 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3817
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3930
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3821
-#: src/protocols/oscar/oscar.c:4042 src/protocols/silc/ops.c:1076
-#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:467
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4156 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:467
 #: src/protocols/zephyr/zephyr.c:643
 msgid "Buddy Information"
 msgstr "好友資訊"
@@ -4883,26 +4928,26 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4852
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4966
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4863 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4977 src/protocols/silc/ops.c:808
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4864 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4978 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4853
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1708
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4967
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "暱稱"
 
@@ -4917,7 +4962,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4907 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:5021 src/protocols/oscar/oscar.c:5029
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
@@ -5019,7 +5064,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1562
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -5057,8 +5102,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
+#: src/protocols/gg/gg.c:1687 src/protocols/gg/gg.c:1689
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -5072,14 +5116,14 @@
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
 #: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:240
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3556
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3669
+#: src/protocols/oscar/oscar.c:6215
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3558
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3671
+#: src/protocols/oscar/oscar.c:6216
 msgid "Deny"
 msgstr "拒絕"
 
@@ -5099,19 +5143,19 @@
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1292
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1294
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
-#: src/protocols/silc/silc.c:1001
+#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:562
+#: src/protocols/silc/silc.c:1002
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
-#: src/protocols/silc/silc.c:1004
+#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:566
+#: src/protocols/silc/silc.c:1006
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -5143,7 +5187,7 @@
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:387
+#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:399
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
@@ -5155,40 +5199,40 @@
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:204
+#: src/protocols/irc/irc.c:216
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:223 src/protocols/toc/toc.c:197
+#: src/protocols/irc/irc.c:235 src/protocols/toc/toc.c:197
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:232
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:247 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1517 src/protocols/oscar/oscar.c:1581
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1651 src/protocols/oscar/oscar.c:1715
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:384 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:396 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:535 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/irc/irc.c:547 src/protocols/silc/chat.c:1368
+#: src/protocols/yahoo/yahoochat.c:1393
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1388
+#: src/protocols/irc/irc.c:550 src/protocols/silc/chat.c:1371
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1402
 msgid "Topic"
 msgstr "主題"
 
@@ -5201,35 +5245,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:642
+#: src/protocols/irc/irc.c:655
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:656
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:643
-#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
+#: src/protocols/irc/irc.c:675 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1577 src/protocols/napster/napster.c:656
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1597
-#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:648
-#: src/protocols/silc/silc.c:1583 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:678 src/protocols/jabber/jabber.c:1598
+#: src/protocols/msn/msn.c:1760 src/protocols/napster/napster.c:661
+#: src/protocols/silc/silc.c:1586 src/protocols/trepia/trepia.c:1298
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1918
+#: src/protocols/irc/irc.c:681 src/protocols/oscar/oscar.c:7349
+#: src/protocols/zephyr/zephyr.c:1922
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:684 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
-#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "使用者"
 
@@ -5270,12 +5315,12 @@
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b>%s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
-#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "姓名"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "所在頻道"
 
@@ -5299,111 +5344,111 @@
 msgstr "%s 的好友資訊"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:286
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:289
+#: src/protocols/irc/msgs.c:291
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:306
+#: src/protocols/irc/msgs.c:308
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:330
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:435
+#: src/protocols/irc/msgs.c:437
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:438
+#: src/protocols/irc/msgs.c:440
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:445
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:465
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:519
+#: src/protocols/irc/msgs.c:521
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:520
+#: src/protocols/irc/msgs.c:522
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:625
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:651
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:760
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:761
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:782
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:822
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:824
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:899
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
+#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:936
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -5607,7 +5652,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1414
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1548
 #: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
 #: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
 msgid "Disconnected."
@@ -5642,12 +5687,12 @@
 msgstr "伺服器送來了無效的驗證挑戰"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:795
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "全名"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:807
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "姓"
 
@@ -5657,8 +5702,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
-#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "暱稱"
@@ -5714,6 +5759,7 @@
 msgstr "所屬部門"
 
 #: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
+#: src/protocols/novell/novell.c:1449
 msgid "Title"
 msgstr "職銜"
 
@@ -5722,7 +5768,7 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:5002
 msgid "Birthday"
 msgstr "生日"
 
@@ -5742,10 +5788,10 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2789
-#: src/protocols/novell/novell.c:2793 src/protocols/oscar/oscar.c:560
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:568
-#: src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2814
+#: src/protocols/novell/novell.c:2818 src/protocols/oscar/oscar.c:694
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:702
+#: src/protocols/yahoo/yahoo.c:2686
 msgid "Status"
 msgstr "狀態"
 
@@ -5754,19 +5800,19 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1580
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "英文別名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4914
-#: src/protocols/silc/ops.c:839
+#: src/protocols/oscar/oscar.c:5020 src/protocols/oscar/oscar.c:5028
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "地址"
 
@@ -5813,98 +5859,99 @@
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1001
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6286
+#: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:200
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: src/protocols/jabber/chat.c:177
+#: src/protocols/jabber/chat.c:201
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: src/protocols/jabber/chat.c:182
+#: src/protocols/jabber/chat.c:206
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
+#: src/protocols/jabber/chat.c:207 src/protocols/jabber/chat.c:208
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:188
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
+#: src/protocols/jabber/chat.c:213 src/protocols/jabber/chat.c:214
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: src/protocols/jabber/chat.c:341
+#: src/protocols/jabber/chat.c:365
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
+#: src/protocols/jabber/chat.c:374 src/protocols/jabber/chat.c:519
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: src/protocols/jabber/chat.c:366
+#: src/protocols/jabber/chat.c:390
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: src/protocols/jabber/chat.c:367
+#: src/protocols/jabber/chat.c:391
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:441 src/protocols/jabber/chat.c:510
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: src/protocols/jabber/chat.c:565
+#: src/protocols/jabber/chat.c:593
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:637 src/protocols/jabber/chat.c:648
 msgid "Roomlist Error"
 msgstr "聊天室清單錯誤"
 
-#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
+#: src/protocols/jabber/chat.c:638 src/protocols/jabber/chat.c:649
 msgid "Error retreiving roomlist"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: src/protocols/jabber/chat.c:661
+#: src/protocols/jabber/chat.c:689
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: src/protocols/jabber/chat.c:698
+#: src/protocols/jabber/chat.c:726
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: src/protocols/jabber/chat.c:699
+#: src/protocols/jabber/chat.c:727
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: src/protocols/jabber/chat.c:702
+#: src/protocols/jabber/chat.c:730
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -5979,13 +6026,13 @@
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4908
-#: src/protocols/oscar/oscar.c:4916 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:5022
+#: src/protocols/oscar/oscar.c:5030 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:853
 #: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "電話"
@@ -6008,9 +6055,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2122
-#: src/protocols/oscar/oscar.c:1585 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2147
+#: src/protocols/oscar/oscar.c:1719 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1020
 msgid "Connecting"
 msgstr "連線中"
 
@@ -6028,7 +6075,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:6566
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -6082,8 +6129,8 @@
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5499
-#: src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:642 src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:6759
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -6111,7 +6158,7 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1552
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -6260,7 +6307,7 @@
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1511
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
@@ -6438,27 +6485,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1555 src/protocols/jabber/jabber.c:1557
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1582
+#: src/protocols/jabber/jabber.c:1583
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1587
+#: src/protocols/jabber/jabber.c:1588
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1593
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1579
+#: src/protocols/jabber/jabber.c:1602 src/protocols/silc/silc.c:1582
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6467,26 +6513,26 @@
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: src/protocols/jabber/message.c:173
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: src/protocols/jabber/message.c:226
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: src/protocols/jabber/message.c:229
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: src/protocols/jabber/message.c:293
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -6651,7 +6697,7 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:189
 msgid "Not logged in"
 msgstr "尚未登入"
 
@@ -6748,8 +6794,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2014
-#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:629
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2150
+#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:629
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6841,7 +6887,7 @@
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -6856,34 +6902,34 @@
 msgstr "不在電腦前"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
-#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2543
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3026
 msgid "Be Right Back"
 msgstr "馬上回來"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2773
-#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2942
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2798
+#: src/protocols/novell/novell.c:2913 src/protocols/novell/novell.c:2967
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
-#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2545
+#: src/protocols/yahoo/yahoo.c:2912 src/protocols/yahoo/yahoo.c:3027
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2553
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:3031
 msgid "On The Phone"
 msgstr "電話中"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
-#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2557
+#: src/protocols/yahoo/yahoo.c:2924 src/protocols/yahoo/yahoo.c:3033
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1357 src/protocols/zephyr/zephyr.c:1376
+#: src/protocols/zephyr/zephyr.c:1360 src/protocols/zephyr/zephyr.c:1379
 msgid "Hidden"
 msgstr "隱藏"
 
@@ -6955,14 +7001,14 @@
 msgstr "取得個人資訊時發生錯誤"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4893
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:5007
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4879
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4993
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6972,7 +7018,8 @@
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1341 src/protocols/novell/novell.c:1443
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "所在位置"
 
@@ -7007,7 +7054,7 @@
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
@@ -7025,6 +7072,7 @@
 "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
 "用者存在,但沒有建立公開的個人資料。"
 
+#. This should never happen
 #: src/protocols/msn/msn.c:1506
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
@@ -7055,16 +7103,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
+#: src/protocols/msn/msn.c:1734 src/protocols/msn/msn.c:1736
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1755 src/protocols/trepia/trepia.c:1293
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1763
+#: src/protocols/msn/msn.c:1764
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -7085,7 +7132,7 @@
 msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2304
+#: src/protocols/oscar/oscar.c:2440
 msgid "Password sent"
 msgstr "密碼送出"
 
@@ -7212,8 +7259,7 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6212
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:540 src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -7227,8 +7273,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
+#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
@@ -7437,7 +7482,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1593
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1618
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
@@ -7447,64 +7492,86 @@
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1632
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1657
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
+#: src/protocols/novell/novell.c:1441
+msgid "Telephone Number"
+msgstr "電話號碼"
+
 #: src/protocols/novell/novell.c:1445
-msgid "Userid"
-msgstr "使用者 ID"
+msgid "Department"
+msgstr "所屬部門"
+
+#: src/protocols/novell/novell.c:1447
+msgid "Personal Title"
+msgstr "個人職銜"
+
+#: src/protocols/novell/novell.c:1451
+#, fuzzy
+msgid "Mailstop"
+msgstr "電子郵件"
+
+#: src/protocols/novell/novell.c:1453 src/protocols/oscar/oscar.c:4980
+#: src/protocols/oscar/oscar.c:4987
+msgid "Email Address"
+msgstr "電子郵件"
+
+#: src/protocols/novell/novell.c:1469
+msgid "User ID"
+msgstr "使用者ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1483
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「User Properties」係指「使用者資訊」,感謝KingAnt及LSchiere解釋
-#: src/protocols/novell/novell.c:1479
+#: src/protocols/novell/novell.c:1504
 msgid "User Properties"
 msgstr "使用者資訊"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:1608
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: src/protocols/novell/novell.c:1608
+#: src/protocols/novell/novell.c:1633
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1638
+#: src/protocols/novell/novell.c:1663
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "處理事件或回覆時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:1672
+#: src/protocols/novell/novell.c:1697
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1687
+#: src/protocols/novell/novell.c:1712
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: src/protocols/novell/novell.c:1822
+#: src/protocols/novell/novell.c:1847
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: src/protocols/novell/novell.c:1849
+#: src/protocols/novell/novell.c:1874
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: src/protocols/novell/novell.c:1850
+#: src/protocols/novell/novell.c:1875
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7515,16 +7582,16 @@
 "\n"
 "時間:%s"
 
-#: src/protocols/novell/novell.c:1852
+#: src/protocols/novell/novell.c:1877
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:1955
+#: src/protocols/novell/novell.c:1980
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:2009
+#: src/protocols/novell/novell.c:2034
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7534,35 +7601,35 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2107
+#: src/protocols/novell/novell.c:2132
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:2129
+#: src/protocols/novell/novell.c:2154
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:2433
+#: src/protocols/novell/novell.c:2458
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2779 src/protocols/oscar/oscar.c:568
-#: src/protocols/oscar/oscar.c:6512 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2804 src/protocols/oscar/oscar.c:702
+#: src/protocols/oscar/oscar.c:6568 src/protocols/yahoo/yahoo.c:2565
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2815
 msgid "Message"
 msgstr "訊息"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2945
+#: src/protocols/novell/novell.c:2914 src/protocols/novell/novell.c:2970
 msgid "Appear Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:3339
+#: src/protocols/novell/novell.c:3364
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
@@ -7576,121 +7643,120 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:3435 src/protocols/novell/novell.c:3437
+#: src/protocols/novell/novell.c:3461 src/protocols/novell/novell.c:3463
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3456
+#: src/protocols/novell/novell.c:3482
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3460
+#: src/protocols/novell/novell.c:3486
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:187
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to client"
 msgstr "到客戶端速率"
 
 #  XXX 可能是誤譯
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:190
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:191
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:192
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:192
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
 #: src/protocols/oscar/oscar.c:193
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by client"
 msgstr "客戶端不支援"
 
-#: src/protocols/oscar/oscar.c:194
-msgid "Refused by client"
-msgstr "被客戶端拒絕"
-
 #: src/protocols/oscar/oscar.c:195
-msgid "Reply too big"
-msgstr "回覆太大了"
+msgid "Refused by client"
+msgstr "被客戶端拒絕"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Reply too big"
+msgstr "回覆太大了"
+
+#: src/protocols/oscar/oscar.c:197
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:199
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:200
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:201
-msgid "Too evil (sender)"
-msgstr "太邪惡了(寄件人)"
-
 #: src/protocols/oscar/oscar.c:202
-msgid "Too evil (receiver)"
-msgstr "太邪惡了(收件人)"
+msgid "Too evil (sender)"
+msgstr "太邪惡了(寄件人)"
 
 #: src/protocols/oscar/oscar.c:203
+msgid "Too evil (receiver)"
+msgstr "太邪惡了(收件人)"
+
+#: src/protocols/oscar/oscar.c:204
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:205
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:206
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:206
-msgid "Request ambiguous"
-msgstr "要求不明確"
-
 #: src/protocols/oscar/oscar.c:207
-msgid "Queue full"
-msgstr "佇列滿了"
+msgid "Request ambiguous"
+msgstr "要求不明確"
 
 #: src/protocols/oscar/oscar.c:208
+msgid "Queue full"
+msgstr "佇列滿了"
+
+#: src/protocols/oscar/oscar.c:209
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:398
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7698,45 +7764,49 @@
 "(為這個訊息轉換編碼時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的客"
 "戶端程式。)"
 
-#: src/protocols/oscar/oscar.c:423
+#: src/protocols/oscar/oscar.c:452
+msgid "(There was an error receiving this message)"
+msgstr "(收取這個訊息時發生錯誤)"
+
+#: src/protocols/oscar/oscar.c:557
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:426
+#: src/protocols/oscar/oscar.c:560
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:429 src/protocols/silc/silc.c:641
+#: src/protocols/oscar/oscar.c:563 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:432 src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6870
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:573
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:442
+#: src/protocols/oscar/oscar.c:576
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:445
+#: src/protocols/oscar/oscar.c:579
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:582
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:451
+#: src/protocols/oscar/oscar.c:585
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:454
+#: src/protocols/oscar/oscar.c:588
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -7747,144 +7817,144 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:591
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:594
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:597
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:600
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:603
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:606
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:609
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:612
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:616
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:619
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:622
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:506 src/protocols/oscar/oscar.c:5508
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:5582
+#: src/protocols/oscar/oscar.c:6762
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5502
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:5576
+#: src/protocols/oscar/oscar.c:6760
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5505
-#: src/protocols/oscar/oscar.c:6705
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:5579
+#: src/protocols/oscar/oscar.c:6761
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:516
+#: src/protocols/oscar/oscar.c:650
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:718
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:727
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:862
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:864
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:737
+#: src/protocols/oscar/oscar.c:871
 msgid "Direct Connect failed"
 msgstr "直接連線失敗"
 
-#: src/protocols/oscar/oscar.c:814 src/protocols/oscar/oscar.c:945
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:1079
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:895
+#: src/protocols/oscar/oscar.c:1029
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1312
+#: src/protocols/oscar/oscar.c:1446
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1317
+#: src/protocols/oscar/oscar.c:1451
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1486
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1356
+#: src/protocols/oscar/oscar.c:1490
 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:1360 src/protocols/oscar/oscar.c:3318
+#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:3431
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:1427 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1561 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:1446
+#: src/protocols/oscar/oscar.c:1580
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:1527
+#: src/protocols/oscar/oscar.c:1661
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:1541
+#: src/protocols/oscar/oscar.c:1675
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7894,48 +7964,48 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:1569
+#: src/protocols/oscar/oscar.c:1703
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:2107
+#: src/protocols/oscar/oscar.c:1804 src/protocols/oscar/oscar.c:2243
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:1678
+#: src/protocols/oscar/oscar.c:1812
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1791 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1925 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:1796
+#: src/protocols/oscar/oscar.c:1930
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1867
+#: src/protocols/oscar/oscar.c:2002
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:1991 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:2127 src/protocols/toc/toc.c:540
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2132
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2000
+#: src/protocols/oscar/oscar.c:2136
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: src/protocols/oscar/oscar.c:2005
+#: src/protocols/oscar/oscar.c:2141
 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."
@@ -7943,21 +8013,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:2010
+#: src/protocols/oscar/oscar.c:2146
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:2042
+#: src/protocols/oscar/oscar.c:2178
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:2114
+#: src/protocols/oscar/oscar.c:2250
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2180
-#: src/protocols/oscar/oscar.c:2269
+#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2316
+#: src/protocols/oscar/oscar.c:2405
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7966,24 +8036,20 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:2153 src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2289 src/protocols/oscar/oscar.c:2319
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:2272
+#: src/protocols/oscar/oscar.c:2408
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3102 src/protocols/oscar/oscar.c:3124
-msgid "(There was an error receiving this message)"
-msgstr "(收取這個訊息時發生錯誤)"
-
-#: src/protocols/oscar/oscar.c:3310
+#: src/protocols/oscar/oscar.c:3423
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:3313
+#: src/protocols/oscar/oscar.c:3426
 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 "
@@ -7992,42 +8058,41 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:3349
+#: src/protocols/oscar/oscar.c:3462
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:3357
+#: src/protocols/oscar/oscar.c:3470
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:3358
+#: src/protocols/oscar/oscar.c:3471
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3501
 #, 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:3393 src/protocols/oscar/oscar.c:3395
+#: src/protocols/oscar/oscar.c:3506 src/protocols/oscar/oscar.c:3508
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:3443 src/protocols/oscar/oscar.c:3445
-#: src/protocols/oscar/oscar.c:3452 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3918
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3979
-#: src/protocols/oscar/oscar.c:6133 src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6253
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:3451
+#: src/protocols/oscar/oscar.c:3564
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:3659
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -8036,11 +8101,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3554 src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:3667 src/protocols/oscar/oscar.c:6213
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3679
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8050,17 +8115,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:3680
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3574
+#: src/protocols/oscar/oscar.c:3687
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:3582
+#: src/protocols/oscar/oscar.c:3695
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8073,7 +8138,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3703
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8086,7 +8151,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3598
+#: src/protocols/oscar/oscar.c:3711
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8099,34 +8164,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3732
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3738
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3629
+#: src/protocols/oscar/oscar.c:3742
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3826
 #, 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:3722
+#: src/protocols/oscar/oscar.c:3835
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3844
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8136,92 +8201,98 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3853
 #, 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:3749
+#: src/protocols/oscar/oscar.c:3862
 #, 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:3758
+#: src/protocols/oscar/oscar.c:3871
 #, 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:3812 src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: src/protocols/oscar/oscar.c:3878
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3992
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-# NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3915
-msgid "Your message did not get sent."
-msgstr "無法送出您的訊息。"
-
-#: src/protocols/oscar/oscar.c:3916
-#, c-format
-msgid "Your message to %s did not get sent:"
-msgstr "您要送給 %s 的訊息無法送出:"
-
-#: src/protocols/oscar/oscar.c:3975
+#. Data is assumed to be the destination sn
+#: src/protocols/oscar/oscar.c:4027
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "無法送出訊息:%s"
+
+#: src/protocols/oscar/oscar.c:4027 src/protocols/oscar/oscar.c:4032
+#: src/protocols/oscar/oscar.c:4090 src/protocols/oscar/oscar.c:4094
+msgid "Unknown reason."
+msgstr "原因不明。"
+
+#: src/protocols/oscar/oscar.c:4030
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "無法送出訊息至 %s:"
+
+#: src/protocols/oscar/oscar.c:4090
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:4093
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4115
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4118
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:4008 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4122 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4206
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4278
+#: src/protocols/oscar/oscar.c:4392
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4612
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:4499
+#: src/protocols/oscar/oscar.c:4613
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8229,142 +8300,138 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:4562
+#: src/protocols/oscar/oscar.c:4676
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:4564
+#: src/protocols/oscar/oscar.c:4678
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:4595
+#: src/protocols/oscar/oscar.c:4709
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4873
-msgid "Email Address"
-msgstr "電子郵件"
-
-#: src/protocols/oscar/oscar.c:4878 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4992 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4993
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:5010
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:5014
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:5019
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4909 src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:5023 src/protocols/oscar/oscar.c:5031
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:5027
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:5035
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4922
+#: src/protocols/oscar/oscar.c:5036
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4923
+#: src/protocols/oscar/oscar.c:5037
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:5038
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:5040
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4936
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5099
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:5006
+#: src/protocols/oscar/oscar.c:5120
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:5010
+#: src/protocols/oscar/oscar.c:5124
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:5048
+#: src/protocols/oscar/oscar.c:5162
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5164
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5195
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號以空白結束。"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5207
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8372,7 +8439,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:5096
+#: src/protocols/oscar/oscar.c:5210
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8380,19 +8447,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5213
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5216
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8401,25 +8468,25 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5113 src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5234
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:5183
+#: src/protocols/oscar/oscar.c:5296
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:5357
+#: src/protocols/oscar/oscar.c:5431
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5432
 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 "
@@ -8428,7 +8495,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:5385
+#: src/protocols/oscar/oscar.c:5459
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8439,19 +8506,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5390
+#: src/protocols/oscar/oscar.c:5464
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:5406 src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6767
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:5424
+#: src/protocols/oscar/oscar.c:5498
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:5425
+#: src/protocols/oscar/oscar.c:5499
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8460,7 +8527,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:5539
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8471,11 +8538,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5544
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:5548
+#: src/protocols/oscar/oscar.c:5622
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8486,16 +8553,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:5550 src/protocols/oscar/oscar.c:5999
-#: src/protocols/oscar/oscar.c:6013
+#: src/protocols/oscar/oscar.c:5624 src/protocols/oscar/oscar.c:6073
+#: src/protocols/oscar/oscar.c:6087
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5785
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:5786
 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 "
@@ -8504,13 +8571,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5894 src/protocols/oscar/oscar.c:5895
-#: src/protocols/oscar/oscar.c:5900 src/protocols/oscar/oscar.c:6057
-#: src/protocols/oscar/oscar.c:6058 src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:5969
+#: src/protocols/oscar/oscar.c:5974 src/protocols/oscar/oscar.c:6131
+#: src/protocols/oscar/oscar.c:6132 src/protocols/oscar/oscar.c:6137
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6071
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8519,11 +8586,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6071 src/protocols/oscar/oscar.c:6085
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6085
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8533,7 +8600,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:6094
+#: src/protocols/oscar/oscar.c:6168
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8543,11 +8610,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6174
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:6133
+#: src/protocols/oscar/oscar.c:6207
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8557,18 +8624,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6175
+#: src/protocols/oscar/oscar.c:6249
 #, 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:6176
+#: src/protocols/oscar/oscar.c:6250
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:6253
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8578,79 +8645,79 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6254
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:6217 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6291 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:6239
+#: src/protocols/oscar/oscar.c:6325
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6414
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:6484
+#: src/protocols/oscar/oscar.c:6540
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6770
+#: src/protocols/oscar/oscar.c:6826
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: src/protocols/oscar/oscar.c:6771
+#: src/protocols/oscar/oscar.c:6827
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6790
+#: src/protocols/oscar/oscar.c:6846
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6796
+#: src/protocols/oscar/oscar.c:6852
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6808
+#: src/protocols/oscar/oscar.c:6864
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6881
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6911
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:6912
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:6919
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:6971
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6960
+#: src/protocols/oscar/oscar.c:7016
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:7019
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:7020
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8658,76 +8725,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:7037
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6982
+#: src/protocols/oscar/oscar.c:7038
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6983
+#: src/protocols/oscar/oscar.c:7039
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:7000
+#: src/protocols/oscar/oscar.c:7056
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:7001
+#: src/protocols/oscar/oscar.c:7057
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:7083 src/protocols/silc/silc.c:795
+#: src/protocols/oscar/oscar.c:7139 src/protocols/silc/silc.c:795
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:7088
+#: src/protocols/oscar/oscar.c:7144
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7094
+#: src/protocols/oscar/oscar.c:7150
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:7099 src/protocols/silc/silc.c:791
+#: src/protocols/oscar/oscar.c:7155 src/protocols/silc/silc.c:791
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7160
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7108
+#: src/protocols/oscar/oscar.c:7164
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7117
+#: src/protocols/oscar/oscar.c:7173
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7177
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7181
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:7129
+#: src/protocols/oscar/oscar.c:7185
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7192
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:7142
+#: src/protocols/oscar/oscar.c:7198
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:7147
+#: src/protocols/oscar/oscar.c:7203
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8741,22 +8808,21 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:7265 src/protocols/oscar/oscar.c:7267
+#: src/protocols/oscar/oscar.c:7322 src/protocols/oscar/oscar.c:7324
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7343
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7291
+#: src/protocols/oscar/oscar.c:7346
 msgid "Auth port"
 msgstr "認證通訊埠"
 
 #: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
 #: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
-#: src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "使用者 %s 不在網路上"
@@ -8837,12 +8903,12 @@
 msgstr "設定即時訊息密碼"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
+#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
-#: src/protocols/silc/ops.c:1277
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
+#: src/protocols/silc/ops.c:1288
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
@@ -8851,18 +8917,18 @@
 msgstr "顯示公鑰"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:222
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
-#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
-#: src/protocols/silc/ops.c:1089
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
@@ -9000,36 +9066,36 @@
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "所用裝置"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
 #: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
 msgid "Timezone"
 msgstr "時區"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "所在位置"
 
@@ -9049,7 +9115,7 @@
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
@@ -9057,81 +9123,81 @@
 msgid "_Passphrase:"
 msgstr "密碼(_P):"
 
-#: src/protocols/silc/chat.c:66
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "頻道資訊"
 
-#: src/protocols/silc/chat.c:68
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: src/protocols/silc/chat.c:105
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>頻道名稱:</b>%s"
 
-#: src/protocols/silc/chat.c:108
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>使用者人數:</b>%d"
 
-#: src/protocols/silc/chat.c:115
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>頻道創立者:</b>%s"
 
-#: src/protocols/silc/chat.c:124
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
 
-#: src/protocols/silc/chat.c:132
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題:</b><br>%s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
 
-#: src/protocols/silc/chat.c:151
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
 
-#: src/protocols/silc/chat.c:221
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:276
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: src/protocols/silc/chat.c:385
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: src/protocols/silc/chat.c:392
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9144,136 +9210,136 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
-#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:563
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/protocols/silc/chat.c:578
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: src/protocols/silc/chat.c:580
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: src/protocols/silc/chat.c:708
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: src/protocols/silc/chat.c:850
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/silc/chat.c:857
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:861
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: src/protocols/silc/chat.c:868
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: src/protocols/silc/chat.c:879
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: src/protocols/silc/chat.c:883
+#: src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:890
+#: src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: src/protocols/silc/chat.c:899
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: src/protocols/silc/chat.c:905
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: src/protocols/silc/chat.c:909
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: src/protocols/silc/chat.c:915
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: src/protocols/silc/chat.c:919
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:981
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:985
+#: src/protocols/silc/chat.c:997
 #, 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:1039
+#: src/protocols/silc/chat.c:1051
 #, 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:1041
+#: src/protocols/silc/chat.c:1053
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1054
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:894
+#: src/protocols/silc/chat.c:1247 src/protocols/silc/silc.c:894
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:895
+#: src/protocols/silc/chat.c:1248 src/protocols/silc/silc.c:895
 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
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全的檔案傳輸"
 
@@ -9295,171 +9361,171 @@
 msgid "File transfer sessions does not exist"
 msgstr "沒有檔案傳輸工作階段"
 
-#: src/protocols/silc/ft.c:207
+#: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "沒有進行中的檔案傳輸工作階段"
 
-#: src/protocols/silc/ft.c:212
+#: src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "檔案傳輸已開始"
 
-#: src/protocols/silc/ft.c:217
+#: src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "無法交換密鑰以供傳輸"
 
-#: src/protocols/silc/ft.c:223
+#: src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "無法開始檔案傳輸"
 
-#: src/protocols/silc/ft.c:343
+#: src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
-#: src/protocols/silc/ops.c:351
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, 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:414
+#: src/protocols/silc/ops.c:423
 #, 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:418
+#: src/protocols/silc/ops.c:427
 #, 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:451
+#: src/protocols/silc/ops.c:460
 #, 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:459
+#: src/protocols/silc/ops.c:468
 #, 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:488
+#: src/protocols/silc/ops.c:497
 #, 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:518 src/protocols/silc/ops.c:523
-#: src/protocols/silc/ops.c:528
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
-#: src/protocols/silc/ops.c:559
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: src/protocols/silc/ops.c:605
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: src/protocols/silc/ops.c:792
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: src/protocols/silc/ops.c:815
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:819
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "職銜"
 
-#: src/protocols/silc/ops.c:823
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "職責"
 
-#: src/protocols/silc/ops.c:827
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "所屬機構"
 
-#: src/protocols/silc/ops.c:831
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "部門"
 
-#: src/protocols/silc/ops.c:850
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "電子郵件"
 
-#: src/protocols/silc/ops.c:855
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "備註"
 
-#: src/protocols/silc/ops.c:903
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: src/protocols/silc/ops.c:1073
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:783
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:783
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:1144
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1278
+#: src/protocols/silc/ops.c:1289
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1292
+#: src/protocols/silc/ops.c:1303
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
-#: src/protocols/silc/ops.c:1355
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9494,99 +9560,99 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: src/protocols/silc/ops.c:1378
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1386
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: src/protocols/silc/ops.c:1399
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1480
+#: src/protocols/silc/ops.c:1491
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1496
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1505
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1529
+#: src/protocols/silc/ops.c:1540
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
+#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
 #: src/protocols/silc/silc.c:173
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1591
+#: src/protocols/silc/ops.c:1602
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: src/protocols/silc/ops.c:1638
+#: src/protocols/silc/ops.c:1649
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1679
+#: src/protocols/silc/ops.c:1690
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1708
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的客戶端程式"
 
-#: src/protocols/silc/ops.c:1711
+#: src/protocols/silc/ops.c:1722
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: src/protocols/silc/ops.c:1714
+#: src/protocols/silc/ops.c:1725
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28    
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1752
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -9713,7 +9779,7 @@
 "人看得見的各項。"
 
 #: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:1141
+#: src/protocols/silc/silc.c:1143
 msgid "Message of the Day"
 msgstr "是日訊息"
 
@@ -9721,7 +9787,7 @@
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1136
+#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1138
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
@@ -9742,106 +9808,106 @@
 msgid "Failed to leave channel"
 msgstr "無法離開聊天室"
 
-#: src/protocols/silc/silc.c:1012
+#: src/protocols/silc/silc.c:1014
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: src/protocols/silc/silc.c:1093
+#: src/protocols/silc/silc.c:1095
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1197
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: src/protocols/silc/silc.c:1200
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1204
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: src/protocols/silc/silc.c:1215
+#: src/protocols/silc/silc.c:1217
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1247
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知的指令:%s(可能是 Gaim 的錯誤)"
 
-#: src/protocols/silc/silc.c:1308
+#: src/protocols/silc/silc.c:1310
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1312
+#: src/protocols/silc/silc.c:1314
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1316
+#: src/protocols/silc/silc.c:1318
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: src/protocols/silc/silc.c:1321
+#: src/protocols/silc/silc.c:1323
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網路上的聊天室"
 
-#: src/protocols/silc/silc.c:1325
+#: src/protocols/silc/silc.c:1327
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1331
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1333 src/protocols/zephyr/zephyr.c:1675
+#: src/protocols/silc/silc.c:1335 src/protocols/zephyr/zephyr.c:1678
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1339
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;暱稱&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: src/protocols/silc/silc.c:1341
+#: src/protocols/silc/silc.c:1343
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1347
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: src/protocols/silc/silc.c:1349
+#: src/protocols/silc/silc.c:1351
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1355
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的客戶端指令"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1361
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: src/protocols/silc/silc.c:1363
+#: src/protocols/silc/silc.c:1365
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1369
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1373
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: src/protocols/silc/silc.c:1375
+#: src/protocols/silc/silc.c:1377
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9849,15 +9915,15 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: src/protocols/silc/silc.c:1379
+#: src/protocols/silc/silc.c:1381
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: src/protocols/silc/silc.c:1383
+#: src/protocols/silc/silc.c:1385
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: src/protocols/silc/silc.c:1387
+#: src/protocols/silc/silc.c:1389
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9865,37 +9931,37 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: src/protocols/silc/silc.c:1391
+#: src/protocols/silc/silc.c:1393
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1395
+#: src/protocols/silc/silc.c:1397
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1399
+#: src/protocols/silc/silc.c:1401
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的客戶端"
 
-#: src/protocols/silc/silc.c:1403
+#: src/protocols/silc/silc.c:1405
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得客戶端或伺服器的公鑰"
 
-#: src/protocols/silc/silc.c:1407
+#: src/protocols/silc/silc.c:1409
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: src/protocols/silc/silc.c:1411
+#: src/protocols/silc/silc.c:1413
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1418
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1422
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9903,39 +9969,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
 "多個頻道的使用者或某一類使用者"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1434
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1439
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:1442
+#: src/protocols/silc/silc.c:1444
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:1445
+#: src/protocols/silc/silc.c:1447
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1452
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1457
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:1458
+#: src/protocols/silc/silc.c:1460
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1465
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1470
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9949,43 +10015,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1554
+#: src/protocols/silc/silc.c:1557
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1556
+#: src/protocols/silc/silc.c:1559
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1586
+#: src/protocols/silc/silc.c:1589
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1592
+#: src/protocols/silc/silc.c:1595
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1596
+#: src/protocols/silc/silc.c:1599
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/silc/silc.c:1604
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1607
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1610
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1613
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
@@ -10231,44 +10297,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1421
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1557
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1679
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1715
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1760 src/protocols/toc/toc.c:1800
+#: src/protocols/toc/toc.c:1924 src/protocols/toc/toc.c:2012
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1957
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2057
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2091
 #, 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:2086
+#: src/protocols/toc/toc.c:2098
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -10283,16 +10349,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2182 src/protocols/toc/toc.c:2184
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2203
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2207
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -10378,8 +10443,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
+#: src/protocols/trepia/trepia.c:1272 src/protocols/trepia/trepia.c:1274
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
@@ -10455,20 +10519,18 @@
 msgstr "使用者名稱無效。"
 
 #: src/protocols/yahoo/yahoo.c:1825
-msgid "Normal authencation failed!"
-msgstr "正常認證失敗!"
-
-# XXX 暫譯
+msgid "Normal authentication failed!"
+msgstr "無法以正常程序認證!"
+
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
-"The normal authencation method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authencation, will which result in "
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 msgstr ""
-"無法以正常方法進行認證。這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方"
-"法。Gaim 隨即嘗試進行 Web Messenger 認證,如能成功登入,Gaim 將會不支援某一些"
-"的功能。"
+"無法以正常方法進行認證,這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方"
+"法。Gaim 隨即嘗試透過 Web Messenger 方法認證,這種認證方法只支援部分功能。"
 
 #: src/protocols/yahoo/yahoo.c:1834
 msgid "Incorrect password."
@@ -10499,33 +10561,33 @@
 
 #: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
 #: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
-#: src/protocols/yahoo/yahoo.c:3014
+#: src/protocols/yahoo/yahoo.c:2547 src/protocols/yahoo/yahoo.c:2914
+#: src/protocols/yahoo/yahoo.c:3028
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
-#: src/protocols/yahoo/yahoo.c:3015
+#: src/protocols/yahoo/yahoo.c:2549 src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:3029
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
-#: src/protocols/yahoo/yahoo.c:3016
+#: src/protocols/yahoo/yahoo.c:2551 src/protocols/yahoo/yahoo.c:2918
+#: src/protocols/yahoo/yahoo.c:3030
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
-#: src/protocols/yahoo/yahoo.c:3018
+#: src/protocols/yahoo/yahoo.c:2555 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:3032
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
-#: src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/yahoo/yahoo.c:2559 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:3034
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10533,36 +10595,36 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:2666
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2736
+#: src/protocols/yahoo/yahoo.c:2745
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2741
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2811
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/yahoo/yahoo.c:2821
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2825
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
@@ -10576,48 +10638,47 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3350 src/protocols/yahoo/yahoo.c:3352
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3356
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3359
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3362
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Japan Pager host"
 msgstr "傳呼系統伺服器(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3365
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3386
 msgid "Japan File transfer host"
 msgstr "檔案傳輸主機(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3389
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3392
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3395
 msgid "YCHT Host"
 msgstr "YCHT 主機"
 
-#: src/protocols/yahoo/yahoo.c:3383
+#: src/protocols/yahoo/yahoo.c:3398
 msgid "YCHT Port"
 msgstr "YCHT 通訊埠"
 
@@ -10716,62 +10777,62 @@
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/yahoo/yahoochat.c:192
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:578
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:579
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1396
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/yahoo/yahoochat.c:1399
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: src/protocols/yahoo/yahoochat.c:1450
+#: src/protocols/yahoo/yahoochat.c:1464
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
@@ -10798,7 +10859,7 @@
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:986 src/protocols/zephyr/zephyr.c:987
+#: src/protocols/zephyr/zephyr.c:989 src/protocols/zephyr/zephyr.c:990
 msgid "Anyone"
 msgstr "任何人"
 
@@ -10809,61 +10870,61 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: src/protocols/zephyr/zephyr.c:1388
+#: src/protocols/zephyr/zephyr.c:1391
 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:1394
+#: src/protocols/zephyr/zephyr.c:1397
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1400
+#: src/protocols/zephyr/zephyr.c:1403
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: src/protocols/zephyr/zephyr.c:1411
+#: src/protocols/zephyr/zephyr.c:1414
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: src/protocols/zephyr/zephyr.c:1680
+#: src/protocols/zephyr/zephyr.c:1683
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1685
+#: src/protocols/zephyr/zephyr.c:1688
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1690
+#: src/protocols/zephyr/zephyr.c:1693
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1695
+#: src/protocols/zephyr/zephyr.c:1698
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1701
+#: src/protocols/zephyr/zephyr.c:1704
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: src/protocols/zephyr/zephyr.c:1706
+#: src/protocols/zephyr/zephyr.c:1709
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1712
+#: src/protocols/zephyr/zephyr.c:1715
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1718
+#: src/protocols/zephyr/zephyr.c:1721
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10871,7 +10932,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1724
+#: src/protocols/zephyr/zephyr.c:1727
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10879,18 +10940,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1729
+#: src/protocols/zephyr/zephyr.c:1732
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1808
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: src/protocols/zephyr/zephyr.c:1808
+#: src/protocols/zephyr/zephyr.c:1811
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -10904,8 +10965,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1888 src/protocols/zephyr/zephyr.c:1890
+#: src/protocols/zephyr/zephyr.c:1892 src/protocols/zephyr/zephyr.c:1894
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -10915,18 +10975,18 @@
 # 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:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 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:1915
+#: src/protocols/zephyr/zephyr.c:1919
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -10954,7 +11014,7 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:181
+#: src/prpl.h:180
 msgid "Custom"
 msgstr "使用者自定"
 
@@ -11063,60 +11123,59 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "不好意思,我離開一下下!"
 
-#: src/stock.c:86
+#: src/stock.c:87
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/stock.c:88
-#, fuzzy
+#: src/stock.c:89
 msgid "_Invite"
-msgstr "邀請"
-
-#: src/stock.c:89
-msgid "_Modify"
-msgstr "修改(_M)"
+msgstr "邀請(_I)"
 
 #: src/stock.c:90
+msgid "_Modify"
+msgstr "修改(_M)"
+
+#: src/stock.c:91
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/stock.c:92
+#: src/stock.c:93
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2353
+#: src/util.c:2352
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2356
+#: src/util.c:2355
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2382
+#: src/util.c:2381
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"
 msgstr[1] "秒"
 
-#: src/util.c:2396
+#: src/util.c:2395
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2404
+#: src/util.c:2403
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2412
+#: src/util.c:2411
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2822
+#: src/util.c:2828
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -11132,6 +11191,38 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid ""
+#~ "No such command. If you didn't mean to type a command, you can turn "
+#~ "commands off from Tools->Preferences->Interface->Conversation->Enable "
+#~ "\"slash\" commands."
+#~ msgstr ""
+#~ "沒有你所輸入的指令;假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交"
+#~ "談→使用『斜線』指令」選項停止指令輸入的功能。"
+
+#~ msgid ""
+#~ "Syntax Error:  You typed the wrong number of arguments to that command. "
+#~ "If you didn't mean to type a command, you can turn commands off from "
+#~ "Tools->Preferences->Interface->Conversation->Enable \"slash\" commands."
+#~ msgstr ""
+#~ "語法錯誤:輸入的參數少於指令所需的參數數量。假如你無意輸入指令,你可以透過"
+#~ "「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
+
+#~ msgid "Userid"
+#~ msgstr "使用者 ID"
+
+# NOTE 譯文更動 by Ambrose
+#~ msgid "Your message did not get sent."
+#~ msgstr "無法送出您的訊息。"
+
+#~ msgid "Your message to %s did not get sent:"
+#~ msgstr "您要送給 %s 的訊息無法送出:"
+
+#~ msgid "That file does not exist."
+#~ msgstr "檔案不存在。"
+
+#~ msgid "%s was not found.\n"
+#~ msgstr "%s 找不到。\n"
+
 #~ msgid "<font sml=\"msn\">%s</font><br>"
 #~ msgstr "<font sml=\"msn\">%s</font><br>"
 
@@ -11263,9 +11354,6 @@
 #~ msgid "Unable to send USR"
 #~ msgstr "無法送出 USR"
 
-#~ msgid "Protocol version not supported"
-#~ msgstr "不支援這個版本的通訊協定"
-
 #~ msgid "Unable to request CVR\n"
 #~ msgstr "無法取得 CVR\n"
 
@@ -11474,9 +11562,6 @@
 #~ msgid "AIM Screen name"
 #~ msgstr "AIM 帳號"
 
-#~ msgid "User"
-#~ msgstr "使用者"
-
 #~ msgid "Preparing Buddy List"
 #~ msgstr "預備好友清單中"