changeset 9379:c7eeab91fe21

[gaim-migrate @ 10187] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 24 Jun 2004 21:53:30 +0000
parents 07e964749a30
children 8c300181122a
files po/zh_TW.po
diffstat 1 files changed, 2068 insertions(+), 1656 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Thu Jun 24 21:50:02 2004 +0000
+++ b/po/zh_TW.po	Thu Jun 24 21:53:30 2004 +0000
@@ -42,7 +42,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.79\n"
-"POT-Creation-Date: 2004-06-06 17:23-0400\n"
+"POT-Creation-Date: 2004-06-24 00:01-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"
@@ -92,6 +92,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/autorecon.c:207 plugins/autorecon.c:209
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
@@ -198,7 +199,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:673 src/gtkaccount.c:2095
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -214,21 +215,21 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1804 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5461
-#: src/protocols/oscar/oscar.c:6443 src/protocols/oscar/oscar.c:6642
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:46
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: 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:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5379 src/protocols/oscar/oscar.c:6650
+#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
 msgid "Back"
 msgstr "返回"
 
@@ -240,11 +241,11 @@
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2274
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2494
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -295,19 +296,15 @@
 "快速的操作 Gaim 的幾項常用功能(包括開啟或關閉好友清單或登入視窗);並讓您可"
 "以選擇將收到的訊息存到佇列中,直到工作匣圖示被點擊,如同使用 ICQ 一樣。"
 
-#: plugins/extplacement.c:85
-msgid "Separate IM and Chat windows"
-msgstr "以不同的視窗顯示即時訊息和聊天"
-
-#: plugins/extplacement.c:87
+#: plugins/extplacement.c:68
 msgid "By conversation count"
 msgstr "依交談個數"
 
-#: plugins/extplacement.c:109
+#: plugins/extplacement.c:89
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: plugins/extplacement.c:114
+#: plugins/extplacement.c:94
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
@@ -318,19 +315,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:114
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:136
+#: plugins/extplacement.c:116
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:138
+#: plugins/extplacement.c:118
 msgid ""
 "Either restrict the number of conversations per windows or use separate "
 "windows for IMs and Chats"
@@ -350,6 +347,7 @@
 #. *< 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。"
@@ -498,66 +496,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:136
-#: plugins/gevolution/assoc-buddy.c:74
+#: plugins/gevolution/add_buddy_dialog.c:133
+#: plugins/gevolution/assoc-buddy.c:71
 msgid "Local Addressbook"
 msgstr "本地端目錄服務"
 
-#: plugins/gevolution/add_buddy_dialog.c:146
-#: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2958 src/gtkprefs.c:914 src/gtkprefs.c:967
-#: src/gtkprefs.c:1817 src/protocols/jabber/jabber.c:923
+#: 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:2984 src/gtkprefs.c:913 src/gtkprefs.c:966
+#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2166
+#: plugins/gevolution/add_buddy_dialog.c:187
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2162
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1174 src/protocols/trepia/trepia.c:398
+#: src/protocols/msn/msn.c:1305 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
 
 #  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
 #  NOTE 譯文更動 by Ambrose
-#: plugins/gevolution/add_buddy_dialog.c:201
+#: plugins/gevolution/add_buddy_dialog.c:198
 msgid "Instant Messaging"
 msgstr "即時傳訊帳號"
 
 #  Add the label.
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:482
+#: plugins/gevolution/add_buddy_dialog.c:479
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6929
+#: plugins/gevolution/add_buddy_dialog.c:492
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6949
 msgid "Search"
 msgstr "搜尋"
 
-#: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3986
-#: src/gtkblist.c:4315
+#: plugins/gevolution/add_buddy_dialog.c:563
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4013
+#: src/gtkblist.c:4341
 msgid "Group:"
 msgstr "群組:"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:592
-#: plugins/gevolution/assoc-buddy.c:486
+#: plugins/gevolution/add_buddy_dialog.c:589
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "New Person"
 msgstr "新增連絡人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:609
+#: plugins/gevolution/add_buddy_dialog.c:606
 msgid "Select Buddy"
 msgstr "選擇好友"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:370
+#: plugins/gevolution/assoc-buddy.c:367
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -567,34 +565,34 @@
 
 # XXX 暫譯
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:449
+#: plugins/gevolution/assoc-buddy.c:446
 msgid "Show user details"
 msgstr "顯示使用者細節"
 
 # XXX 暫譯
-#: plugins/gevolution/assoc-buddy.c:450
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Hide user details"
 msgstr "隱藏使用者細節"
 
 # XXX 暫譯
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:503
+#: plugins/gevolution/assoc-buddy.c:500
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3810
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
+#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3834
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: plugins/gevolution/gevolution.c:221
+#: plugins/gevolution/gevolution.c:220
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:352
+#: plugins/gevolution/gevolution.c:351
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -602,11 +600,11 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: plugins/gevolution/gevolution.c:355
+#: plugins/gevolution/gevolution.c:354
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
-#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "帳號"
 
@@ -617,7 +615,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:465
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -627,47 +625,48 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
+#. *  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:270
+#: plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "請在下面輸入這個使用者的資訊。"
 
-#: plugins/gevolution/new_person_dialog.c:274
+#: plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "請在下面輸入好友的帳號及其類別。"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "帳號類型:"
 
-#: plugins/gevolution/new_person_dialog.c:298
+#: plugins/gevolution/new_person_dialog.c:295
 msgid "Screenname:"
 msgstr "帳號:"
 
 #  NOTE 選擇性資訊
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:318
+#: plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:340
 #: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: plugins/gevolution/new_person_dialog.c:353
+#: plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:365
+#: plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:385
+#: plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "電子郵件:"
 
@@ -699,6 +698,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
@@ -721,7 +721,7 @@
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:795
+#: plugins/idle.c:67 src/dialogs.c:786
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -797,33 +797,33 @@
 msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "通知種類"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: plugins/notify.c:583
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
-#: plugins/notify.c:590
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "焦點視窗(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "加入字串到視窗標題之前(_S):"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
@@ -831,38 +831,38 @@
 # NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
 # NOTE 譯文更動 by Ambrose
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "設定視窗的「URGENT」(緊急資訊)提示(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "通知移除"
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "當交談取得輸入焦點時移除通知(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "送出訊息後移除通知(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
+#: plugins/notify.c:704
+msgid "Remove on switch to conversation ta_b"
 msgstr "當視窗標籤被點選後移除通知(_B)"
 
 #. *< api_version
@@ -872,14 +872,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:792
 msgid "Message Notification"
 msgstr "訊息通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:765 plugins/notify.c:767
+#. *  description
+#: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
@@ -896,6 +897,7 @@
 
 #. *< name
 #. *< version
+#. *< summary
 #: plugins/perl/perl.c:533 plugins/perl/perl.c:534
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
@@ -993,6 +995,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
@@ -1011,6 +1014,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
@@ -1061,6 +1065,7 @@
 #. *< 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 的支援。"
@@ -1079,6 +1084,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
@@ -1097,6 +1103,7 @@
 #. *< 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。"
@@ -1135,6 +1142,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/statenotify.c:81 plugins/statenotify.c:84
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1163,6 +1171,7 @@
 #. *< name
 #. *< version
 #. *  summary
+#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
@@ -1197,6 +1206,7 @@
 #. *< 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 風格的時間戳記到交談中。"
@@ -1221,7 +1231,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:908
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -1273,8 +1283,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
-#: src/gtkprefs.c:2406
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3025
+#: src/gtkprefs.c:2399
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1293,8 +1303,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:959
-#: src/gtkprefs.c:2407 src/protocols/msn/msn.c:1420
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
+#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1630
 msgid "Conversations"
 msgstr "交談"
 
@@ -1321,135 +1331,135 @@
 
 #: src/about.c:95
 msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
-"Yahoo!, MSN, IRC, Jabber, 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>"
+"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:105
+#: src/about.c:106
 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:110
+#: src/about.c:111
 msgid "Active Developers"
 msgstr "現任開發者"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/about.c:113
+#: src/about.c:114
 msgid "lead developer"
 msgstr "主要開發者"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: src/about.c:117
+#: src/about.c:118
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
+#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
 msgid "developer"
 msgstr "開發者"
 
-#: src/about.c:124
+#: src/about.c:125
 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:131
+#: src/about.c:132
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:152
-msgid "former Jabber developer"
-msgstr "前 Jabber 開發者"
-
 #: src/about.c:153
+msgid "former Jabber developer"
+msgstr "前 Jabber 開發者"
+
+#: src/about.c:154
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:156
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:164
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:165 src/about.c:203
+#: src/about.c:166 src/about.c:204
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:205
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:169
+#: src/about.c:170
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/about.c:170 src/about.c:205
+#: src/about.c:171 src/about.c:206
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:207
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:208
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:209
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -1457,50 +1467,50 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/about.c:177 src/about.c:209
+#: src/about.c:178 src/about.c:210
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/about.c:178 src/about.c:211
+#: src/about.c:179 src/about.c:212
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:179
+#: src/about.c:180
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:180
+#: src/about.c:181
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:181
+#: src/about.c:182
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:182 src/about.c:212
+#: src/about.c:183 src/about.c:213
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:186 src/about.c:213
+#: src/about.c:187 src/about.c:214 src/about.c:215
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:187
+#: src/about.c:188
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
@@ -1508,52 +1518,52 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/about.c:188
+#: src/about.c:189
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/about.c:189 src/about.c:215
+#: src/about.c:190 src/about.c:217
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:192
+#: src/about.c:193
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:200
+#: src/about.c:201
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:201
+#: src/about.c:202
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:202
+#: src/about.c:203
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:210
+#: src/about.c:211
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:214
+#: src/about.c:216
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:216
+#: src/about.c:218
 msgid "Chinese"
 msgstr "中文"
 
@@ -1590,45 +1600,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
-#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2343 src/gtkrequest.c:235
 #: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:208 src/protocols/msn/msn.c:223
-#: src/protocols/msn/msn.c:238 src/protocols/msn/msn.c:253
-#: src/protocols/oscar/oscar.c:3352 src/protocols/oscar/oscar.c:3446
-#: src/protocols/oscar/oscar.c:6711 src/protocols/oscar/oscar.c:6808
-#: src/protocols/oscar/oscar.c:6860 src/protocols/oscar/oscar.c:6946
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1134
-#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:2657
+#: 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:3353 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
+#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
+#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:1004
+#: src/protocols/silc/ops.c:1465 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2743 src/protocols/yahoo/yahoo.c:2752
 #: src/request.h:1242
 msgid "OK"
 msgstr "確定"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:818
-#: src/dialogs.c:835 src/dialogs.c:854 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4354
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
+#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1948
+#: src/gtkaccount.c:2439 src/gtkblist.c:2344 src/gtkblist.c:4379
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:516 src/protocols/jabber/chat.c:710
 #: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:209
-#: src/protocols/msn/msn.c:224 src/protocols/msn/msn.c:239
-#: src/protocols/msn/msn.c:254 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3312
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3390
-#: src/protocols/oscar/oscar.c:3447 src/protocols/oscar/oscar.c:6712
-#: src/protocols/oscar/oscar.c:6809 src/protocols/oscar/oscar.c:6861
-#: src/protocols/oscar/oscar.c:6930 src/protocols/oscar/oscar.c:6947
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1135 src/protocols/silc/chat.c:710
-#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2649
-#: src/protocols/yahoo/yahoo.c:2658 src/request.h:1242 src/request.h:1252
+#: 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:1371 src/protocols/oscar/oscar.c:3313
+#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
+#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
+#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
+#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
+#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1466
+#: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2744 src/protocols/yahoo/yahoo.c:2753
+#: src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
@@ -1637,7 +1649,7 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:515
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
@@ -1660,7 +1672,7 @@
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1359 src/gtkconv.c:3541 src/gtkconv.c:3640
+#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "移除"
@@ -1673,11 +1685,11 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:590
+#: src/blist.c:681
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1192
+#: src/blist.c:1321
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1692,27 +1704,27 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1201
+#: src/blist.c:1330
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
+#: src/protocols/jabber/buddy.c:571 src/protocols/novell/novell.c:2736
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:1579
+#: src/blist.c:1721
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/blist.c:2236
+#: src/blist.c:2192
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "在解析您的好友清單時發生錯誤。好友清單沒有被讀入,舊檔已移至blist.xml~。"
 
-#: src/blist.c:2239
+#: src/blist.c:2195
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1747,7 +1759,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1920
+#: src/conversation.c:1960
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1757,62 +1769,66 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1923
+#: src/conversation.c:1963
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2014
+#: src/conversation.c:2054
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2017
+#: src/conversation.c:2057
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2059
+#: src/conversation.c:2099
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2061
+#: src/conversation.c:2101
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2132
+#: src/conversation.c:2172
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2134
+#: src/conversation.c:2174
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2458
+#: src/conversation.c:2464
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2460 src/gtkprefs.c:1343
+#: src/conversation.c:2466
+msgid "Separate IM and Chat windows"
+msgstr "以不同的視窗顯示即時訊息和聊天"
+
+#: src/conversation.c:2468 src/gtkprefs.c:1335
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2462
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2464
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1822,39 +1838,39 @@
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">警告 %s?</span>\n"
 "\n"
-"這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
-
-#: src/dialogs.c:182
+"這個動作將會增加 %s 的警告等級,同時他(她)將被限制以更嚴格的速率限制。\n"
+
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:301
+#: src/dialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1862,11 +1878,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:328 src/dialogs.c:329
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1876,107 +1892,107 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:513
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:524
+#: src/dialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/dialogs.c:575
+#: src/dialogs.c:566
 msgid "Get User Log"
 msgstr "讀取使用者日誌"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:634
+#: src/dialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:644
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:697
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:727
+#: src/dialogs.c:718
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:783
+#: src/dialogs.c:774
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: src/dialogs.c:791
+#: src/dialogs.c:782
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/dialogs.c:814
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:817 src/dialogs.c:834 src/dialogs.c:853 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:571
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:569
 msgid "Alias"
 msgstr "別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:831
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:832
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:849
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:851
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
@@ -2087,23 +2103,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:372 src/gaimrc.c:1411
+#: src/gaimrc.c:372 src/gaimrc.c:1409
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2960
+#: src/gaimrc.c:1219 src/gtkblist.c:2986
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2961
+#: src/gaimrc.c:1221 src/gtkblist.c:2987
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1225 src/gtkblist.c:2962
+#: src/gaimrc.c:1223 src/gtkblist.c:2988
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gtkaccount.c:289
+#: src/gtkaccount.c:309
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2115,176 +2131,168 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:560
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:401
+#: src/gtkaccount.c:577
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3958
+#: src/gtkaccount.c:582 src/gtkblist.c:3985
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:479
+#: src/gtkaccount.c:655
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3972 src/gtkblist.c:4301
+#: src/gtkaccount.c:660 src/gtkblist.c:3999 src/gtkblist.c:4327
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:664
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:542
+#: src/gtkaccount.c:720
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:555
+#: src/gtkaccount.c:733
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:564
-msgid "Buddy icon file:"
-msgstr "好友圖示檔案:"
-
-#: src/gtkaccount.c:574
-msgid "_Browse"
-msgstr "瀏覽(_B)"
-
-#: src/gtkaccount.c:580
-msgid "_Reset"
-msgstr "重置(_R)"
+#: src/gtkaccount.c:742
+msgid "Buddy icon:"
+msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:642
+#: src/gtkaccount.c:831
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:967 src/gtkaccount.c:1014
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:973 src/gtkaccount.c:1021
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:979 src/gtkaccount.c:1028
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:985 src/gtkaccount.c:1035
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:991 src/gtkaccount.c:1042
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1147
+#: src/gtkaccount.c:997 src/gtkaccount.c:1049 src/gtkprefs.c:1139
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:899
+#: src/gtkaccount.c:1088
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:903
+#: src/gtkaccount.c:1092
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:919
+#: src/gtkaccount.c:1108
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1141
+#: src/gtkaccount.c:1126 src/gtkprefs.c:1133
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1168
+#: src/gtkaccount.c:1135 src/gtkprefs.c:1160
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1186
+#: src/gtkaccount.c:1139 src/gtkprefs.c:1178
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:958
+#: src/gtkaccount.c:1147
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1223
+#: src/gtkaccount.c:1152 src/gtkprefs.c:1215
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1524
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1333
+#: src/gtkaccount.c:1526
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
-#: src/gtkaccount.c:1357
+#: src/gtkaccount.c:1550
 msgid "Show more options"
 msgstr "顯示細節"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gtkaccount.c:1358
+#: src/gtkaccount.c:1551
 msgid "Show fewer options"
 msgstr "隱藏細節"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1578 src/protocols/jabber/jabber.c:665
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1739
+#: src/gtkaccount.c:1943
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:1947 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3977
+#: src/gtkaccount.c:2061 src/protocols/oscar/oscar.c:3981
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5459
-#: src/protocols/oscar/oscar.c:6641 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2385 src/protocols/zephyr/zephyr.c:1167
-#: src/protocols/zephyr/zephyr.c:1177
+#: src/gtkaccount.c:2084 src/protocols/jabber/jabber.c:957
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2487 src/protocols/zephyr/zephyr.c:1208
+#: src/protocols/zephyr/zephyr.c:1218
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:1898
+#: src/gtkaccount.c:2102
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2414
 #, 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:2224
+msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
+
+#: src/gtkaccount.c:2428
 msgid ""
 "\n"
 "\n"
@@ -2294,227 +2302,228 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2228
+#: src/gtkaccount.c:2432
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2232
+#: src/gtkaccount.c:2436
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4353 src/gtkconv.c:1361
-#: src/gtkconv.c:3534 src/gtkconv.c:3633 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3609
+#: src/gtkaccount.c:2438 src/gtkblist.c:4378 src/gtkconv.c:1354
+#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
+#: src/protocols/silc/chat.c:578
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:812
+#: src/gtkblist.c:810
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:833
+#: src/gtkblist.c:831
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:844 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1132 src/gtkblist.c:3153
+#: src/gtkblist.c:1128 src/gtkblist.c:3179
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:3144
+#: src/gtkblist.c:1131 src/gtkblist.c:3170
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1133
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1135
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
+#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
+#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1191
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1193
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1199
+#: src/gtkblist.c:1195
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1201
+#: src/gtkblist.c:1197
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1223 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1225
+#: src/gtkblist.c:1221
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1249 src/gtkblist.c:1278
+#: src/gtkblist.c:1245 src/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1283
+#: src/gtkblist.c:1279
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1941 src/gtkconv.c:4166 src/gtkpounce.c:347
+#: src/gtkblist.c:1937 src/gtkconv.c:4199 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2288
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2289
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2290
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2291
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2292
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2294
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2295
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2296
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2297
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2298
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2301
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2304
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2305
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
+#: src/gtkblist.c:2306
+msgid "/Tools/Buddy _Pounce"
+msgstr "/工具/好友狀態捕捉(_P)"
+
+#: src/gtkblist.c:2307
+msgid "/Tools/Account Ac_tions"
+msgstr "/工具/帳號相關指令(_T)"
+
+#: src/gtkblist.c:2308
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具/模組相關指令(_U)"
+
 #: src/gtkblist.c:2310
-msgid "/Tools/Buddy _Pounce"
-msgstr "/工具/好友狀態捕捉(_P)"
+msgid "/Tools/A_ccounts"
+msgstr "/工具/帳號清單(_C)"
 
 #: src/gtkblist.c:2311
-msgid "/Tools/Account Ac_tions"
-msgstr "/工具/帳號相關指令(_T)"
+msgid "/Tools/_File Transfers"
+msgstr "/工具/檔案傳輸(_F)"
 
 #: src/gtkblist.c:2312
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/工具/模組相關指令(_U)"
+msgid "/Tools/R_oom List"
+msgstr "/工具/聊天室清單(_O)"
+
+#: src/gtkblist.c:2313
+msgid "/Tools/Pr_eferences"
+msgstr "/工具/偏好設定(_E)"
 
 #: src/gtkblist.c:2314
-msgid "/Tools/A_ccounts"
-msgstr "/工具/帳號清單(_C)"
-
-#: src/gtkblist.c:2315
-msgid "/Tools/_File Transfers"
-msgstr "/工具/檔案傳輸(_F)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/工具/隱私設定(_I)"
 
 #: src/gtkblist.c:2316
-msgid "/Tools/R_oom List"
-msgstr "/工具/聊天室清單(_O)"
-
-#: src/gtkblist.c:2317
-msgid "/Tools/Pr_eferences"
-msgstr "/工具/偏好設定(_E)"
-
-#: src/gtkblist.c:2318
-msgid "/Tools/Pr_ivacy"
-msgstr "/工具/隱私設定(_I)"
-
-#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2319
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2320
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2321
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2322
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2340
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2340
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2341
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2369
 #, c-format
 msgid ""
 "\n"
@@ -2523,7 +2532,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2435
+#: src/gtkblist.c:2433
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2531,12 +2540,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2448
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2464
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2544,7 +2553,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2465
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2552,7 +2561,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2560,7 +2569,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2568,7 +2577,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2576,7 +2585,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2584,7 +2593,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2592,7 +2601,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2600,7 +2609,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2475
+#: src/gtkblist.c:2473
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2608,7 +2617,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2476
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2616,96 +2625,96 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2747
+#: src/gtkblist.c:2773
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2749
+#: src/gtkblist.c:2775
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2754
+#: src/gtkblist.c:2780
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2757
+#: src/gtkblist.c:2783
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2875
+#: src/gtkblist.c:2901
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2878
+#: src/gtkblist.c:2904
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:2907
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3026
+#: src/gtkblist.c:3052
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:3029
+#: src/gtkblist.c:3055
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3032
+#: src/gtkblist.c:3058
 msgid "/Tools/Account Actions"
 msgstr "/工具/帳號相關指令"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3061
 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:3124
+#: src/gtkblist.c:3150
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3152
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3150
+#: src/gtkblist.c:3176
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3159
+#: src/gtkblist.c:3185
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3162
+#: src/gtkblist.c:3188
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3167
+#: src/gtkblist.c:3193
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3170
+#: src/gtkblist.c:3196
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3175
+#: src/gtkblist.c:3201
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3912 src/protocols/silc/buddy.c:731
-#: src/protocols/silc/buddy.c:991 src/protocols/silc/buddy.c:1036
-#: src/protocols/silc/buddy.c:1126 src/protocols/yahoo/yahoo.c:2572
+#: src/gtkblist.c:3939 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:2668
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3936
+#: src/gtkblist.c:3963
 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. "
@@ -2715,37 +2724,37 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3996 src/gtkblist.c:4281
+#: src/gtkblist.c:4023 src/gtkblist.c:4307
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4240
+#: src/gtkblist.c:4266
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4247
+#: src/gtkblist.c:4273
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4271
+#: src/gtkblist.c:4297
 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:4350
+#: src/gtkblist.c:4375
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4351
+#: src/gtkblist.c:4376
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:4918 src/gtkblist.c:5015
+#: src/gtkblist.c:4943 src/gtkblist.c:5040
 msgid "No actions available"
 msgstr "沒有相關指令"
 
@@ -2795,29 +2804,29 @@
 msgid "Time"
 msgstr "時間"
 
-#: src/gtkconv.c:173
+#: src/gtkconv.c:168
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:212
+#: src/gtkconv.c:186 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:192 src/gtkdebug.c:213 src/gtkft.c:1123
+#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1122
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:370
+#: src/gtkconv.c:365
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "我在用 Gaim v%s。"
 
-#: src/gtkconv.c:379
+#: src/gtkconv.c:374
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項為:version"
 
-#: src/gtkconv.c:392
+#: src/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2825,374 +2834,376 @@
 "要獲得某一指令的說明,可輸入「/help &lt;指令&gt;。\n"
 "在這個情況下,可用的指令如下:\n"
 
-#: src/gtkconv.c:426
+#: src/gtkconv.c:421
 msgid "No such command (in this context)."
 msgstr "(在這個情況下)沒有這個指令"
 
-#: src/gtkconv.c:473
+#: src/gtkconv.c:468
 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 ""
-"沒有這個指令。"
-"假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
-
-#: src/gtkconv.c:481
+"沒有這個指令。假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交談→使用"
+"『斜線』指令」選項停止指令輸入的功能。"
+
+#: src/gtkconv.c:476
 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:488
+"語法錯誤:輸入的參數少於指令所需的參數數量。假如你無意輸入指令,你可以透過"
+"「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
+
+#: src/gtkconv.c:483
 msgid "Your command failed for an unknown reason."
 msgstr "指令的執行因為不明原因失敗。"
 
-#: src/gtkconv.c:495
+#: src/gtkconv.c:490
 msgid "That command only works in Chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: src/gtkconv.c:498
+#: src/gtkconv.c:493
 msgid "That command only works in IMs, not Chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: src/gtkconv.c:502
+#: src/gtkconv.c:497
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: src/gtkconv.c:718
+#: src/gtkconv.c:713
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:746
+#: src/gtkconv.c:741
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:767
+#: src/gtkconv.c:762
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:787
+#: src/gtkconv.c:782
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:127
+#: src/gtkconv.c:890 src/gtkdebug.c:127
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:155
+#: src/gtkconv.c:916 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1319
+#: src/gtkconv.c:1312
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkconv.c:1327
+#: src/gtkconv.c:1320
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1329 src/gtkprefs.c:779
+#: src/gtkconv.c:1322 src/gtkprefs.c:778
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1338 src/gtkconv.c:3548
+#: src/gtkconv.c:1331 src/gtkconv.c:3577
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1347
+#: src/gtkconv.c:1340
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2435
+#: src/gtkconv.c:2467
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2440
+#: src/gtkconv.c:2472
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2446
+#: src/gtkconv.c:2478
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2818
+#: src/gtkconv.c:2847
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2826
+#: src/gtkconv.c:2855
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2929
+#: src/gtkconv.c:2958
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3335
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3352
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3325
+#: src/gtkconv.c:3354
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3330
+#: src/gtkconv.c:3359
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3332
+#: src/gtkconv.c:3361
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3362
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3364
 msgid "/Conversation/Clear"
 msgstr "/交談/清空"
 
-#: src/gtkconv.c:3339
+#: src/gtkconv.c:3368
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3341
+#: src/gtkconv.c:3370
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3372
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3374
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3350
+#: src/gtkconv.c:3379
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3381
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3383
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3356
+#: src/gtkconv.c:3385
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3390
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3363
+#: src/gtkconv.c:3392
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3397
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3401
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3402
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3403
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3375
+#: src/gtkconv.c:3404
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3405
 msgid "/Options/Show T_imestamps"
 msgstr "/選項/顯示時間戳記(_I)"
 
-#: src/gtkconv.c:3418
+#: src/gtkconv.c:3447
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3452
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3429
+#: src/gtkconv.c:3458
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3462
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3437
+#: src/gtkconv.c:3466
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3443
+#: src/gtkconv.c:3472
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3476
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3451
+#: src/gtkconv.c:3480
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3455
+#: src/gtkconv.c:3484
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3461
+#: src/gtkconv.c:3490
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3465
+#: src/gtkconv.c:3494
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3500
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3474
+#: src/gtkconv.c:3503
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3477
+#: src/gtkconv.c:3506
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3509
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3504 src/gtkconv.c:3506 src/gtkconv.c:3612 src/gtkconv.c:3614
+#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3520
+#: src/gtkconv.c:3549
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3552
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3527 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3559
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3566
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3573
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3551 src/gtkconv.c:3895
+#: src/gtkconv.c:3580 src/gtkconv.c:3923
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3655
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3629
+#: src/gtkconv.c:3658
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3636
+#: src/gtkconv.c:3665
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3643
+#: src/gtkconv.c:3672
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3753
+#: src/gtkconv.c:3782
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3817
+#: src/gtkconv.c:3845
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3872
+#: src/gtkconv.c:3900
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3884
+#: src/gtkconv.c:3912
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4457
+#: src/gtkconv.c:4490
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4985 src/gtkconv.c:5017 src/gtkconv.c:5138 src/gtkconv.c:5205
+#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5704 src/gtkconv.c:5707
+#: src/gtkconv.c:5757 src/gtkconv.c:5760
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkconv.c:6078
-msgid "Send an IRC style action to a buddy or chat."
-msgstr ""
-
-#: src/gtkconv.c:6081
-msgid "Send various debug information to the current conversation."
-msgstr "向目前的交談送出一些除錯資訊。"
-
-#: src/gtkconv.c:6085
-msgid "/help:  List available commands."
-msgstr "/help:列出可用的指令。"
-
-#: src/gtkconv.c:6089
-msgid "/help &lt;command&gt;:  Help on a specific command."
-msgstr "/help &lt;指令&gt;:顯示某一指令的說明。"
+#: src/gtkconv.c:6132
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
+
+#: src/gtkconv.c:6135
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
+
+#: src/gtkconv.c:6139
+msgid "help:  List available commands."
+msgstr "help:列出可用的指令。"
+
+#: src/gtkconv.c:6143
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
 #: src/gtkdebug.c:226
@@ -3218,7 +3229,7 @@
 
 #: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
-msgstr "完了"
+msgstr "已完成"
 
 #: src/gtkft.c:167 src/gtkft.c:925
 msgid "Canceled"
@@ -3314,40 +3325,40 @@
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1099
+#: src/gtkft.c:1098
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
-#: src/gtkft.c:1108
+#: src/gtkft.c:1107
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/gtkft.c:1122
+#: src/gtkft.c:1121
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1025
+#: src/gtkft.c:1147 src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "開啟..."
 
 # XXX 要覆查
-#: src/gtkft.c:1150
+#: src/gtkft.c:1149
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: src/gtkft.c:1200
+#: src/gtkft.c:1199
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkft.c:1233
+#: src/gtkft.c:1232
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: src/gtkft.c:1237
+#: src/gtkft.c:1236
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3359,47 +3370,47 @@
 "遠端通訊埠:%d"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: src/gtkimhtml.c:559
+#: src/gtkimhtml.c:567
 msgid "Pa_ste As Text"
 msgstr "貼上純文字(_S)"
 
-#: src/gtkimhtml.c:1004
+#: src/gtkimhtml.c:1012
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: src/gtkimhtml.c:1005
+#: src/gtkimhtml.c:1013
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: src/gtkimhtml.c:1211
+#: src/gtkimhtml.c:1218
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:1223
+#: src/gtkimhtml.c:1230
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:1233
+#: src/gtkimhtml.c:1240
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2668
+#: src/gtkimhtml.c:2761
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2676
+#: src/gtkimhtml.c:2769
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2685
+#: src/gtkimhtml.c:2778
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2708
+#: src/gtkimhtml.c:2801
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3441,66 +3452,66 @@
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:473
+#: src/gtkimhtmltoolbar.c:472
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:499
+#: src/gtkimhtmltoolbar.c:498
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:638
+#: src/gtkimhtmltoolbar.c:637
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:653
+#: src/gtkimhtmltoolbar.c:652
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:871
+#: src/gtkimhtmltoolbar.c:870
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:882
+#: src/gtkimhtmltoolbar.c:881
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:893
+#: src/gtkimhtmltoolbar.c:892
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:909
+#: src/gtkimhtmltoolbar.c:908
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:921
+#: src/gtkimhtmltoolbar.c:920
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:937
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:950
+#: src/gtkimhtmltoolbar.c:949
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:961
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:977
+#: src/gtkimhtmltoolbar.c:976
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:987
+#: src/gtkimhtmltoolbar.c:986
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:998
+#: src/gtkimhtmltoolbar.c:997
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -3727,15 +3738,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:402
+#: src/gtkprefs.c:401
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:404
+#: src/gtkprefs.c:403
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:628
+#: src/gtkprefs.c:627
 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."
@@ -3743,156 +3754,160 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:667
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:675 src/gtkprefs.c:2203 src/protocols/jabber/buddy.c:265
+#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
 #: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:770
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:771
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:774
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:779
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:781
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:784
+#: src/gtkprefs.c:783
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:786
 msgid "_Ignore formatting on incoming messages"
 msgstr "忽略所收訊息的格式化(_I)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:790
 msgid "Default Formatting"
 msgstr "預設格式"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:792
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出訊息時使用預設格式化(_S)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:824
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #  XXX 暫譯
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:827
 msgid "_Clear Formatting"
 msgstr "清除格式化(_C)"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:864
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:866
+#: src/gtkprefs.c:865
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:868
+#: src/gtkprefs.c:867
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:870
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:871
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:874
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:875
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:877
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:893
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:902
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:909 src/gtkprefs.c:962
+#: src/gtkprefs.c:908 src/gtkprefs.c:961
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
+#: src/gtkprefs.c:910 src/gtkprefs.c:963
+msgid "Pictures"
+msgstr "圖形"
+
 #: src/gtkprefs.c:911 src/gtkprefs.c:964
-msgid "Pictures"
-msgstr "圖形"
+msgid "Text"
+msgstr "文字"
 
 #: src/gtkprefs.c:912 src/gtkprefs.c:965
-msgid "Text"
-msgstr "文字"
-
-#: src/gtkprefs.c:913 src/gtkprefs.c:966
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:916 src/gtkprefs.c:981
+#: src/gtkprefs.c:915
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:918
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:920 src/gtkprefs.c:977
+#: src/gtkprefs.c:919 src/gtkprefs.c:979
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:923
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:925
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:927
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:972
+msgid "Enable \"_slash\" commands"
+msgstr "使用「斜線」指令(_S)"
+
+#: src/gtkprefs.c:975
 msgid "Show _formatting toolbar"
 msgstr "顯示格式工具列(_F)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:977
 msgid "Show _aliases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_A)"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:981
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
@@ -3901,162 +3916,158 @@
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
 #: src/gtkprefs.c:985
-msgid "Enable \"_slash\" commands"
-msgstr "使用「斜線」指令(_S)"
-
-#: src/gtkprefs.c:987
+msgid "_Raise IM window on events"
+msgstr "當事件發生時,將視窗提到最上方(_R)"
+
+#: src/gtkprefs.c:988
+msgid "Raise chat _window on events"
+msgstr "當事件發生時,將交談視窗提到最上方(_R)"
+
+#: src/gtkprefs.c:990
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天室內以不同顏色區別不同的暱稱(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:994
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:1009
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
-
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1011
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
+#: src/gtkprefs.c:1014
+msgid "Tab p_lacement:"
+msgstr "標籤位置(_L):"
+
 #: src/gtkprefs.c:1016
-msgid "Tab p_lacement:"
-msgstr "標籤位置(_L):"
+msgid "Top"
+msgstr "視窗上方"
+
+#: src/gtkprefs.c:1017
+msgid "Bottom"
+msgstr "視窗下方"
 
 #: src/gtkprefs.c:1018
-msgid "Top"
-msgstr "視窗上方"
+msgid "Left"
+msgstr "視窗左側"
 
 #: src/gtkprefs.c:1019
-msgid "Bottom"
-msgstr "視窗下方"
-
-#: src/gtkprefs.c:1020
-msgid "Left"
-msgstr "視窗左側"
-
-#: src/gtkprefs.c:1021
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:1027
-msgid "New window _placement:"
-msgstr "新視窗位置(_P):"
-
-#  FIXME 譯文有待改進
-#: src/gtkprefs.c:1034
-msgid "Number of conversations per window:"
-msgstr "視窗內之交談個數上限:"
-
-#: src/gtkprefs.c:1084 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4832
+# NOTE 不直接翻譯,改依功能呈現的方式翻譯譯文
+#: src/gtkprefs.c:1025
+msgid "New conversation _placement:"
+msgstr "新交談開啟於(_P):"
+
+#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4837
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1078
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1095
+#: src/gtkprefs.c:1087
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1111
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1122
+#: src/gtkprefs.c:1114
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1117
 msgid "_Start Port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1132
+#: src/gtkprefs.c:1124
 msgid "_End Port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1139
+#: src/gtkprefs.c:1131
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1143
+#: src/gtkprefs.c:1135
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1197
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1261
+#: src/gtkprefs.c:1253
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1254
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1255
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1256
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1265
+#: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1258
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1267
+#: src/gtkprefs.c:1259
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1260
 msgid "Gnome Default"
 msgstr "GNOME預設值"
 
-#: src/gtkprefs.c:1277
+#: src/gtkprefs.c:1269
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1320
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1324
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1331
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1333
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1334
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1344
+#: src/gtkprefs.c:1336
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1358
+#: src/gtkprefs.c:1350
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4065,83 +4076,83 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1387
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1390
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1401
+#: src/gtkprefs.c:1393
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1403
+#: src/gtkprefs.c:1395
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1406
+#: src/gtkprefs.c:1398
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1408
+#: src/gtkprefs.c:1400
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1403
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1417
+#: src/gtkprefs.c:1409
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1415
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1421
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1567
+#: src/gtkprefs.c:1559
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:1642
+#: src/gtkprefs.c:1634
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1635
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1645
+#: src/gtkprefs.c:1637
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1641
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1642
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1644
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1646
 msgid "Automatic"
 msgstr "自動"
 
+#: src/gtkprefs.c:1653
+msgid "Command"
+msgstr "指令"
+
 #: src/gtkprefs.c:1661
-msgid "Command"
-msgstr "指令"
-
-#: src/gtkprefs.c:1669
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4150,86 +4161,87 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1696
+#: src/gtkprefs.c:1688
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:1747
+#: src/gtkprefs.c:1739
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1754
+#: src/gtkprefs.c:1746
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1773
+#: src/gtkprefs.c:1765
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:1777
+#: src/gtkprefs.c:1769
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1781
+#: src/gtkprefs.c:1773
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:1805
+#: src/gtkprefs.c:1797
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:1800
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1809
+#: src/gtkprefs.c:1801
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1803
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1814 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3990
-#: src/protocols/yahoo/yahoo.c:2381 src/protocols/yahoo/yahoo_profile.c:785
+#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1175
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
+#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2483
+#: src/protocols/yahoo/yahoo_profile.c:653
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1807
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1818
+#: src/gtkprefs.c:1810
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1813
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
+#: src/gtkprefs.c:1815
+msgid "Windows usage"
+msgstr "Windows 使用狀況"
+
 #: src/gtkprefs.c:1823
-msgid "Windows usage"
-msgstr "Windows 使用狀況"
-
-#: src/gtkprefs.c:1831
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1832
+#: src/gtkprefs.c:1824
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1828
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1844
+#: src/gtkprefs.c:1836
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1921
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4244,7 +4256,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1926
+#: src/gtkprefs.c:1922
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4259,65 +4271,65 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:2159
+#: src/gtkprefs.c:2155
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:2173
+#: src/gtkprefs.c:2169
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:2221
+#: src/gtkprefs.c:2217
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2366
+#: src/gtkprefs.c:2362
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2402
+#: src/gtkprefs.c:2398
 msgid "Interface"
 msgstr "介面"
 
+#: src/gtkprefs.c:2401
+msgid "Message Text"
+msgstr "訊息文字"
+
+#: src/gtkprefs.c:2402
+msgid "Shortcuts"
+msgstr "快捷鍵"
+
 #: src/gtkprefs.c:2403
 msgid "Smiley Themes"
 msgstr "表情主題"
 
 #: src/gtkprefs.c:2404
-msgid "Message Text"
-msgstr "訊息文字"
+msgid "Sounds"
+msgstr "音效"
 
 #: src/gtkprefs.c:2405
-msgid "Shortcuts"
-msgstr "快捷鍵"
-
-#: src/gtkprefs.c:2408
-msgid "Sounds"
-msgstr "音效"
-
-#: src/gtkprefs.c:2409
 msgid "Network"
 msgstr "網路"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2412
+#: src/gtkprefs.c:2408
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2410
 msgid "Logging"
 msgstr "日誌"
 
+#: src/gtkprefs.c:2411
+msgid "Away / Idle"
+msgstr "離開 / 閒置"
+
+#: src/gtkprefs.c:2412
+msgid "Away Messages"
+msgstr "離開訊息"
+
 #: src/gtkprefs.c:2415
-msgid "Away / Idle"
-msgstr "離開 / 閒置"
-
-#: src/gtkprefs.c:2416
-msgid "Away Messages"
-msgstr "離開訊息"
-
-#: src/gtkprefs.c:2419
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4341,63 +4353,63 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -4405,13 +4417,13 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
 #: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
 #: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
@@ -4421,8 +4433,8 @@
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:298
-#: src/protocols/silc/util.c:300
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "關閉"
 
@@ -4638,12 +4650,12 @@
 msgstr "無聊(預設)"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:433 src/protocols/msn/state.c:29
+#: src/protocols/msn/msn.c:466 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:2720
-#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2744
-#: src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2842
+#: src/protocols/yahoo/yahoo.c:2958
 msgid "Available"
 msgstr "上線"
 
@@ -4657,10 +4669,10 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5374 src/protocols/oscar/oscar.c:5452
-#: src/protocols/oscar/oscar.c:5476 src/protocols/oscar/oscar.c:6647
-#: src/protocols/oscar/oscar.c:6652 src/protocols/yahoo/yahoo.c:2379
-#: src/protocols/yahoo/yahoo.c:2764 src/protocols/yahoo/yahoo.c:2869
+#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2481
+#: src/protocols/yahoo/yahoo.c:2862 src/protocols/yahoo/yahoo.c:2970
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4677,7 +4689,7 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
@@ -4709,68 +4721,68 @@
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: src/protocols/gg/gg.c:407
+#: src/protocols/gg/gg.c:406
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:414
+#: src/protocols/gg/gg.c:413
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/yahoo/yahoo.c:2063 src/protocols/yahoo/yahoo.c:2126
+#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2153 src/protocols/yahoo/yahoo.c:2216
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:617
+#: src/protocols/gg/gg.c:616
 msgid "Reading data"
 msgstr "讀取資料中"
 
-#: src/protocols/gg/gg.c:620
+#: src/protocols/gg/gg.c:619
 msgid "Balancer handshake"
 msgstr "和負載平衡器交談中"
 
-#: src/protocols/gg/gg.c:623
+#: src/protocols/gg/gg.c:622
 msgid "Reading server key"
 msgstr "讀取 Server Key 中"
 
-#: src/protocols/gg/gg.c:626
+#: src/protocols/gg/gg.c:625
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:636
+#: src/protocols/gg/gg.c:635
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:701
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:713
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:719
+#: src/protocols/gg/gg.c:718
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:721
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:769
+#: src/protocols/gg/gg.c:768
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
@@ -4783,64 +4795,66 @@
 msgstr "Gadu-Gadu 搜尋引擎"
 
 #  XXX 這個有點怪,譯錯?
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:866
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4824
+#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
-#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4835 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:784
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:617
-#: src/protocols/oscar/oscar.c:4836 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
+#: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4825
+#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
 msgid "Birth Year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
-#: src/protocols/gg/gg.c:903
+#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
+#: src/protocols/gg/gg.c:904
 msgid "Sex"
 msgstr "性別"
 
 #. City
-#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:627
-#: src/protocols/oscar/oscar.c:4879 src/protocols/oscar/oscar.c:4887
+#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1110
-#: src/protocols/msn/msn.c:1355 src/protocols/napster/napster.c:392
-#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4018
-#: src/protocols/toc/toc.c:468 src/protocols/yahoo/yahoo_profile.c:643
-#: src/protocols/yahoo/yahoo_profile.c:665
-#: src/protocols/yahoo/yahoo_profile.c:705
-#: src/protocols/yahoo/yahoo_profile.c:917 src/protocols/zephyr/zephyr.c:568
+#. show it to the user
+#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1244
+#: src/protocols/msn/msn.c:1552 src/protocols/msn/msn.c:1568
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
+#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
+#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:785
+#: src/protocols/yahoo/yahoo_profile.c:837
+#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: src/protocols/gg/gg.c:950
+#: src/protocols/gg/gg.c:951
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:958
+#: src/protocols/gg/gg.c:959
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
@@ -4933,7 +4947,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
-#: src/protocols/toc/toc.c:1543
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -4971,7 +4985,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
+#. *  description
+#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4984,15 +4999,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "使用者 %s (%s%s%s%s%s) 要求您的認證。"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3537
-#: src/protocols/oscar/oscar.c:6080
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:6100
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3539
-#: src/protocols/oscar/oscar.c:6081
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
+#: src/protocols/oscar/oscar.c:6101
 msgid "Deny"
 msgstr "拒絕"
 
@@ -5004,11 +5019,11 @@
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/protocols/icq/gaim_icq.c:497
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr "暱稱:"
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
@@ -5017,37 +5032,19 @@
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:141
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-"<B>支援的 IRC 指令:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-
-#: src/protocols/irc/cmds.c:150
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-"<B>支援的 IRC 指令:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#: src/protocols/irc/cmds.c:473 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:444 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:476 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:447 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
-#: src/protocols/yahoo/yahoo_filexfer.c:228
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
 msgstr "檔案傳輸已被取消"
 
@@ -5078,8 +5075,8 @@
 
 #. FIXME: remove this when the ui does it for us.
 #: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/msn/msn.c:502 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6751 src/protocols/yahoo/yahoo.c:2591
+#: src/protocols/msn/msn.c:544 src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2689
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -5110,17 +5107,17 @@
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:537 src/protocols/silc/chat.c:1345
-#: src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1341
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:540 src/protocols/silc/chat.c:1348
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1363
+#: src/protocols/silc/ops.c:1027 src/protocols/yahoo/yahoochat.c:1350
 msgid "Topic"
 msgstr "主題"
 
@@ -5133,34 +5130,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:641
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:642
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:661 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1555 src/protocols/napster/napster.c:640
-#: src/protocols/silc/ops.c:935
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
+#: src/protocols/silc/ops.c:945
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:664 src/protocols/jabber/jabber.c:1576
-#: src/protocols/msn/msn.c:1537 src/protocols/napster/napster.c:645
-#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
+#: src/protocols/msn/msn.c:1748 src/protocols/napster/napster.c:647
+#: src/protocols/silc/silc.c:1484 src/protocols/trepia/trepia.c:1295
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:667 src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:670 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1477
-#: src/protocols/silc/ops.c:931
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
+#: src/protocols/silc/ops.c:941
 msgid "Username"
 msgstr "使用者"
 
@@ -5188,8 +5185,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:804
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:939
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Realname"
 msgstr "姓名"
 
@@ -5240,6 +5237,11 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
+#: src/protocols/irc/msgs.c:323
+#, c-format
+msgid "Users on %s: %s"
+msgstr "在 %s 內的使用者:%s"
+
 #: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "沒有那個頻道"
@@ -5270,62 +5272,236 @@
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:604
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:602
+#: src/protocols/irc/msgs.c:609
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:709
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:703
+#: src/protocols/irc/msgs.c:710
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:724
+#: src/protocols/irc/msgs.c:731
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:771
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:766
+#: src/protocols/irc/msgs.c:773
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:841
+#: src/protocols/irc/msgs.c:848
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:842 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:849 src/protocols/silc/ops.c:888
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:872
+#: src/protocols/irc/msgs.c:885
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:189
-msgid "No help is available at this time for this command."
-msgstr "暫時未有為這個指令提供說明。"
-
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:109
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "action &lt;要執行的動作&gt;:執行一個動作。"
+
+#: src/protocols/irc/parse.c:110
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr "away [訊息]:設定一個離開訊息,或者在離開時不指定任何訊息。"
+
+# XXX 暫譯
+#: src/protocols/irc/parse.c:111
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有"
+"「頻道管理者」的權限才能夠執行這個動作。"
+
+#: src/protocols/irc/parse.c:112
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr ""
+"devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道"
+"中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
+
+#: src/protocols/irc/parse.c:113
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的"
+"頻道。"
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給"
+"予並有需要)加入所指定的聊天室。"
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如"
+"有給予並有需要)加入所指定的聊天室。"
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限"
+"才能夠執行這個動作。"
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作"
+"之後,強行中止您的連線。</i>"
+
+#: src/protocols/irc/parse.c:118
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;暱稱|頻道&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除頻道╱使用者模式。"
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾"
+"頻道中)。"
+
+#: src/protocols/irc/parse.c:121
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻"
+"道管理者」權限才能執行這個動作。"
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指"
+"令。"
+
+#: src/protocols/irc/parse.c:125
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr "part [頻道] [訊息]:離開目前的頻道,或者指定的頻道,並送出指定的訊息。"
+
+#: src/protocols/irc/parse.c:126
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器"
+"的回應速度)。"
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公"
+"眾頻道)。"
+
+#: src/protocols/irc/parse.c:128
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
+
+# XXX 暫譯
+#: src/protocols/irc/parse.c:129
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的"
+"權限才能夠執行這個動作。"
+
+#: src/protocols/irc/parse.c:131
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "topic [新主題]:檢視或修改頻道主題"
+
+#: src/protocols/irc/parse.c:132
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:設定或解除使用者模式。"
+
+#: src/protocols/irc/parse.c:133
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理"
+"者」的權限才能執行這個動作。"
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它"
+"了。"
+
+#: src/protocols/irc/parse.c:135
+msgid "whois &lt;nick&gt;:  Get information on a user."
+msgstr "whois &lt;暱稱&gt;:取得使用者資訊。"
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5346,7 +5522,7 @@
 
 #: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
-#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:686
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "停止連線。"
 
@@ -5378,24 +5554,24 @@
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:770
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:605
+#: src/protocols/silc/ops.c:780
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:782
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:618
+#: src/protocols/silc/ops.c:792
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:622
 msgid "Given Name"
 msgstr "名"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/silc/buddy.c:1474
-#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
-#: src/protocols/yahoo/yahoo_profile.c:800
+#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1169
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:796
+#: src/protocols/silc/ops.c:937 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -5426,8 +5602,7 @@
 
 #. Country
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
-#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
-#: src/protocols/trepia/trepia.c:416
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "國家"
 
@@ -5437,8 +5612,8 @@
 msgstr "電話"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1529
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:637 src/protocols/yahoo/yahoo_profile.c:990
 msgid "Email"
 msgstr "電子郵件"
 
@@ -5459,30 +5634,30 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4860
+#: src/protocols/oscar/oscar.c:4865
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:510 src/protocols/jabber/buddy.c:511
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:512
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/buddy.c:553
+#: src/protocols/jabber/buddy.c:554
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:421 src/protocols/novell/novell.c:2742
-#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:937
+#: src/protocols/msn/msn.c:454 src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:574
 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Status"
 msgstr "狀態"
 
@@ -5491,19 +5666,19 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1558
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1559
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
+#: src/protocols/jabber/buddy.c:626 src/protocols/silc/ops.c:788
 msgid "Middle Name"
 msgstr "英文別名"
 
 #: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
-#: src/protocols/oscar/oscar.c:4878 src/protocols/oscar/oscar.c:4886
-#: src/protocols/silc/ops.c:814
+#: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
+#: src/protocols/silc/ops.c:824
 msgid "Address"
 msgstr "地址"
 
@@ -5550,7 +5725,7 @@
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
@@ -5653,7 +5828,7 @@
 #: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
-#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "寫入錯誤"
 
@@ -5716,14 +5891,14 @@
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4880
-#: src/protocols/oscar/oscar.c:4888 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4885
+#: src/protocols/oscar/oscar.c:4893 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1531
-#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/ops.c:829 src/protocols/silc/silc.c:639
 msgid "Phone"
 msgstr "電話"
 
@@ -5744,10 +5919,10 @@
 msgstr "已登出。"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:578
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2105
+#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:617
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
 #: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2251 src/protocols/zephyr/zephyr.c:865
+#: src/protocols/yahoo/yahoo.c:2347 src/protocols/zephyr/zephyr.c:906
 msgid "Connecting"
 msgstr "連線中"
 
@@ -5765,7 +5940,7 @@
 
 #: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
 #: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6451
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5819,8 +5994,8 @@
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6643
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:6663
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -5848,7 +6023,7 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1533
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -5997,7 +6172,7 @@
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1285
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
@@ -6115,13 +6290,13 @@
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1400 src/protocols/jabber/jabber.c:1403
-msgid "Configure a chat room"
-msgstr "設定一個聊天室"
-
-#: src/protocols/jabber/jabber.c:1406
-msgid "Change your nickname"
-msgstr "修改暱稱"
+#: src/protocols/jabber/jabber.c:1400
+msgid "config:  Configure a chat room."
+msgstr "config:設定一個聊天室"
+
+#: src/protocols/jabber/jabber.c:1403
+msgid "configure:  Configure a chat room."
+msgstr "configure:設定一個聊天室"
 
 # #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
 # #: src/buddy_chat.c:1544
@@ -6129,37 +6304,37 @@
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
 #: src/protocols/jabber/jabber.c:1410
-msgid "Leave the room"
-msgstr "離開聊天室。"
+msgid "part [room]:  Leave the room."
+msgstr "part [聊天室]:離開聊天室。"
 
 #: src/protocols/jabber/jabber.c:1413
-#, fuzzy
-msgid "Register with a chat room"
-msgstr "加入一個聊天室"
+msgid "register:  Register with a chat room."
+msgstr "register:加入一個聊天室"
 
 #: src/protocols/jabber/jabber.c:1418
-msgid "View or change the topic"
-msgstr "檢視或修改聊天主題"
+msgid "topic [new topic]:  View or change the topic."
+msgstr "topic [新主題]:檢視或修改聊天主題"
 
 #: src/protocols/jabber/jabber.c:1422
-msgid "Ban a user from the room"
-msgstr "禁止某使用者進入聊天室"
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
 #: src/protocols/jabber/jabber.c:1426
-msgid "Invite a user to the room"
-msgstr "邀請某使用者進入聊天室"
+msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
+msgstr "invite &lt使用者&gt; [聊天室]:邀請某使用者進入聊天室"
 
 #: src/protocols/jabber/jabber.c:1430
-msgid "Join a chat on this server"
-msgstr "加入位於這個伺服器的一個聊天室"
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
 #: src/protocols/jabber/jabber.c:1434
-msgid "Kick a user from the room"
-msgstr "由聊天室踼出某使用者"
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
 #: src/protocols/jabber/jabber.c:1438
-msgid "Send a private message to another user"
-msgstr "傳送私人訊息給另一個使用者"
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
 
 #: src/protocols/jabber/jabber.c:1452
 msgid "Hide Operating System"
@@ -6175,26 +6350,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1535
+#. *  description
+#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1561
+#: src/protocols/jabber/jabber.c:1562
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1566
+#: src/protocols/jabber/jabber.c:1567
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1571
+#: src/protocols/jabber/jabber.c:1572
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1580 src/protocols/silc/silc.c:1051
+#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1480
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6231,39 +6407,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: src/protocols/jabber/presence.c:223
+#: src/protocols/jabber/presence.c:224
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:226
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
 
-#: src/protocols/jabber/presence.c:279 src/protocols/jabber/presence.c:280
+#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
 msgstr "設定聊天室"
 
-#: src/protocols/jabber/presence.c:285
+#: src/protocols/jabber/presence.c:286
 msgid "Accept Defaults"
 msgstr "使用預設值"
 
-#: src/protocols/jabber/presence.c:307
+#: src/protocols/jabber/presence.c:308
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: src/protocols/jabber/presence.c:310
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -6335,7 +6511,7 @@
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:528
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6485,7 +6661,7 @@
 msgstr "伺服器太忙碌"
 
 #: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
+#: src/protocols/silc/ops.c:1274 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6519,38 +6695,38 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: src/protocols/msn/msn.c:96
+#: src/protocols/msn/msn.c:114
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:222
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:223
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:239
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:254
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:269
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:264
+#: src/protocols/msn/msn.c:282
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:265
+#: src/protocols/msn/msn.c:283
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6558,93 +6734,97 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:287
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:270
+#: src/protocols/msn/msn.c:288
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:295
+#: src/protocols/msn/msn.c:311
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:297
+#: src/protocols/msn/msn.c:313
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:434 src/protocols/msn/msn.c:726
+#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:765
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:435 src/protocols/msn/msn.c:728
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2361
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2860
+#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:767
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2463
+#: src/protocols/yahoo/yahoo.c:2844 src/protocols/yahoo/yahoo.c:2960
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:436 src/protocols/msn/msn.c:730
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2726
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2363
-#: src/protocols/yahoo/yahoo.c:2748 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:769
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2465
+#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2961
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:437 src/protocols/msn/msn.c:732
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2371
-#: src/protocols/yahoo/yahoo.c:2756 src/protocols/yahoo/yahoo.c:2865
+#: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:771
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2473
+#: src/protocols/yahoo/yahoo.c:2854 src/protocols/yahoo/yahoo.c:2965
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:438 src/protocols/msn/msn.c:734
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2375
-#: src/protocols/yahoo/yahoo.c:2760 src/protocols/yahoo/yahoo.c:2867
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:773
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2477
+#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2967
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:439 src/protocols/msn/msn.c:736
-#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
+#: src/protocols/msn/msn.c:472 src/protocols/msn/msn.c:775
+#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:450
+#: src/protocols/msn/msn.c:483
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:455
+#: src/protocols/msn/msn.c:488
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:459
+#: src/protocols/msn/msn.c:492
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:463
+#: src/protocols/msn/msn.c:496
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:469
+#: src/protocols/msn/msn.c:502
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:474
+#: src/protocols/msn/msn.c:507
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:530
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: src/protocols/msn/msn.c:511
+#: src/protocols/msn/msn.c:540
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
+#: src/protocols/msn/msn.c:549
+msgid "Update Buddy Icon"
+msgstr "更新好友圖示"
+
 # XXX 暫譯
-#: src/protocols/msn/msn.c:547
+#: src/protocols/msn/msn.c:586
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6652,83 +6832,107 @@
 "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
 "gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:1111 src/protocols/yahoo/yahoo_profile.c:644
-msgid "<html><body><b>Error retrieving profile</b></body></html>"
-msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
+#: src/protocols/msn/msn.c:1156 src/protocols/msn/msn.c:1169
+#: src/protocols/msn/msn.c:1175 src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:653
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b>%s<br>"
+
+#: src/protocols/msn/msn.c:1156
+msgid "MSN ID"
+msgstr "MSN 帳號"
+
+#: src/protocols/msn/msn.c:1164 src/protocols/yahoo/yahoo_profile.c:648
+#: src/protocols/zephyr/zephyr.c:602
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>別名:</b>%s<br>"
+
+#: src/protocols/msn/msn.c:1241 src/protocols/msn/msn.c:1565
+#: src/protocols/yahoo/yahoo_profile.c:746
+#: src/protocols/yahoo/yahoo_profile.c:834
+msgid "Error retrieving profile"
+msgstr "取得個人資訊時發生錯誤"
 
 #. Age
-#: src/protocols/msn/msn.c:1181 src/protocols/oscar/oscar.c:4865
+#: src/protocols/msn/msn.c:1312 src/protocols/oscar/oscar.c:4870
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:812
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1188 src/protocols/oscar/oscar.c:4851
+#: src/protocols/msn/msn.c:1319 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:820
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1197 src/protocols/yahoo/yahoo_profile.c:816
+#: src/protocols/msn/msn.c:1328 src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1204 src/protocols/yahoo/yahoo_profile.c:808
+#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1212 src/protocols/yahoo/yahoo_profile.c:824
+#: src/protocols/msn/msn.c:1343 src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1229 src/protocols/msn/msn.c:1235
-#: src/protocols/msn/msn.c:1242 src/protocols/msn/msn.c:1249
-#: src/protocols/msn/msn.c:1256
+#: src/protocols/msn/msn.c:1360 src/protocols/msn/msn.c:1366
+#: src/protocols/msn/msn.c:1373 src/protocols/msn/msn.c:1381
+#: src/protocols/msn/msn.c:1388
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1265 src/protocols/msn/msn.c:1278
-#: src/protocols/msn/msn.c:1285
+#: src/protocols/msn/msn.c:1397 src/protocols/msn/msn.c:1403
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1417
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1294 src/protocols/msn/msn.c:1300
-#: src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1426 src/protocols/msn/msn.c:1432
+#: src/protocols/msn/msn.c:1439
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: src/protocols/msn/msn.c:1316 src/protocols/msn/msn.c:1322
-#: src/protocols/yahoo/yahoo_profile.c:859
+#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: src/protocols/msn/msn.c:1330 src/protocols/yahoo/yahoo_profile.c:902
+#: src/protocols/msn/msn.c:1462 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1341 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1473 src/protocols/silc/ops.c:820
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
 
-# NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1363 src/protocols/yahoo/yahoo_profile.c:923
-#, c-format
-msgid "User information for %s unavailable"
-msgstr "無法取得使用者 %s 的個人資訊"
-
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo_profile.c:925
+#. put a link to the actual profile URL
+#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
+#: src/util.c:792
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: src/protocols/msn/msn.c:1484 src/protocols/yahoo/yahoo_profile.c:1121
+msgid "Profile URL"
+msgstr "個人資料網址"
+
+#: src/protocols/msn/msn.c:1566 src/protocols/yahoo/yahoo_profile.c:1140
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1635
 msgid "Display conversation closed notices"
 msgstr "顯示「交談視窗已關閉」的通知"
 
-#: src/protocols/msn/msn.c:1430
+#: src/protocols/msn/msn.c:1640
 msgid "Display timeout notices"
 msgstr "顯示「交談已逾時」的通知"
 
@@ -6742,15 +6946,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1511 src/protocols/msn/msn.c:1513
+#. *  description
+#: src/protocols/msn/msn.c:1722 src/protocols/msn/msn.c:1724
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1743 src/protocols/trepia/trepia.c:1290
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1541
+#: src/protocols/msn/msn.c:1752
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6777,7 +6982,7 @@
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:1067
+#: src/protocols/msn/notification.c:1071
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6804,7 +7009,7 @@
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: src/protocols/msn/notification.c:1132
+#: src/protocols/msn/notification.c:1136
 msgid "Syncing with server"
 msgstr "與伺服器同步中"
 
@@ -6837,11 +7042,11 @@
 msgid "Received HTTP error. Please report this."
 msgstr "收到一個 HTTP 錯誤;請向開發者報告。"
 
-#: src/protocols/msn/switchboard.c:201
+#: src/protocols/msn/switchboard.c:191
 msgid "The conversation has become inactive and timed out."
 msgstr "目前的交談閒置太久,並且已經逾時。"
 
-#: src/protocols/msn/switchboard.c:209
+#: src/protocols/msn/switchboard.c:199
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 關閉了交談視窗。"
@@ -6856,50 +7061,50 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/napster/napster.c:229
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
-#: src/protocols/napster/napster.c:243
+#: src/protocols/napster/napster.c:244
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
 
-#: src/protocols/napster/napster.c:306
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者:%s,檔案:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:317
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#: src/protocols/napster/napster.c:325
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:383
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
-#: src/protocols/napster/napster.c:421
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:427
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6151
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -6913,230 +7118,231 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
+#. *  description
+#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
-#: src/protocols/novell/nmuser.c:2027
+#: src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: src/protocols/novell/nmuser.c:2030
+#: src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: src/protocols/novell/nmuser.c:2033
+#: src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: src/protocols/novell/nmuser.c:2036
+#: src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: src/protocols/novell/nmuser.c:2040
+#: src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: src/protocols/novell/nmuser.c:2043
+#: src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: src/protocols/novell/nmuser.c:2047
+#: src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: src/protocols/novell/nmuser.c:2050
+#: src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "不支援"
 
-#: src/protocols/novell/nmuser.c:2054
+#: src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: src/protocols/novell/nmuser.c:2057
+#: src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "密碼無效"
 
-#: src/protocols/novell/nmuser.c:2060
+#: src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: src/protocols/novell/nmuser.c:2063
+#: src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: src/protocols/novell/nmuser.c:2072
+#: src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器;請稍後重試"
 
-#: src/protocols/novell/nmuser.c:2075
+#: src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: src/protocols/novell/nmuser.c:2078
+#: src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
-#: src/protocols/novell/nmuser.c:2081
+#: src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "使用者名稱或密碼無效"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "無法辦識您所輸入的主機或使用者名稱"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: src/protocols/novell/nmuser.c:2098
+#: src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: src/protocols/novell/nmuser.c:2101
+#: src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您輸入了無效的使用者名稱"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: src/protocols/novell/nmuser.c:2116
+#: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
 
-#: src/protocols/novell/nmuser.c:2119
+#: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#: src/protocols/novell/novell.c:119
+#: src/protocols/novell/novell.c:116
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:229
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: src/protocols/novell/novell.c:378
+#: src/protocols/novell/novell.c:375
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:404
+#: src/protocols/novell/novell.c:401
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: src/protocols/novell/novell.c:514
+#: src/protocols/novell/novell.c:511
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:519
+#: src/protocols/novell/novell.c:516
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:566
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:614
+#: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:686
+#: src/protocols/novell/novell.c:683
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
 #  FIXME 譯文有待改進
-#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:779
+#: src/protocols/novell/novell.c:776
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
 
-#: src/protocols/novell/novell.c:832
+#: src/protocols/novell/novell.c:829
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至您的允許清單 (%s)。"
 
-#: src/protocols/novell/novell.c:900
+#: src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
 
-#: src/protocols/novell/novell.c:995
+#: src/protocols/novell/novell.c:992
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: src/protocols/novell/novell.c:1428
+#: src/protocols/novell/novell.c:1426
 msgid "Userid"
 msgstr "使用者 ID"
 
@@ -7153,35 +7359,35 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1442
+#: src/protocols/novell/novell.c:1440
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「User Properties」係指「使用者資訊」,感謝KingAnt及LSchiere解釋
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1460
 msgid "User Properties"
 msgstr "使用者資訊"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:1566
+#: src/protocols/novell/novell.c:1564
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: src/protocols/novell/novell.c:1591
+#: src/protocols/novell/novell.c:1589
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1621
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "處理事件或回覆時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:1655
+#: src/protocols/novell/novell.c:1653
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1670
+#: src/protocols/novell/novell.c:1668
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
@@ -7239,21 +7445,21 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6453 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2485
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2744
 msgid "Message"
 msgstr "訊息"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
+#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
 msgid "Appear Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:3291
+#: src/protocols/novell/novell.c:3293
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
@@ -7267,15 +7473,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
+#. *  description
+#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3388
+#: src/protocols/novell/novell.c:3408
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3392
+#: src/protocols/novell/novell.c:3412
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
@@ -7389,12 +7596,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1527
-#: src/protocols/silc/silc.c:631
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:635
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6757
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -7477,18 +7684,18 @@
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5473
-#: src/protocols/oscar/oscar.c:6646
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:6666
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5467
-#: src/protocols/oscar/oscar.c:6644
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:6664
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5470
-#: src/protocols/oscar/oscar.c:6645
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
+#: src/protocols/oscar/oscar.c:6665
 msgid "Occupied"
 msgstr "忙碌"
 
@@ -7549,11 +7756,11 @@
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3311
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:869
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
@@ -7588,9 +7795,9 @@
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:210
-#: src/protocols/yahoo/yahoo_filexfer.c:219
-#: src/protocols/yahoo/yahoo_filexfer.c:229
+#: src/protocols/oscar/oscar.c:1797 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 "無法建立檔案介紹。"
 
@@ -7656,16 +7863,16 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:3303
+#: src/protocols/oscar/oscar.c:3304
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:3306
+#: src/protocols/oscar/oscar.c:3307
 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 "
@@ -7674,42 +7881,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:3342
+#: src/protocols/oscar/oscar.c:3343
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:3350
+#: src/protocols/oscar/oscar.c:3351
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3352
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:3381
+#: src/protocols/oscar/oscar.c:3382
 #, 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:3386 src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3438
-#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3527
-#: src/protocols/oscar/oscar.c:3547 src/protocols/oscar/oscar.c:3898
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:6072
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
+#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
+#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6138
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:3444
+#: src/protocols/oscar/oscar.c:3445
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3528
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7718,11 +7925,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:6078
+#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:3547
+#: src/protocols/oscar/oscar.c:3548
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7732,17 +7939,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3549
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:3563
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7755,7 +7962,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3571
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7768,7 +7975,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3579
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7781,34 +7988,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3601
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/oscar/oscar.c:3607
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3611
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3695
+#: src/protocols/oscar/oscar.c:3696
 #, 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:3704
+#: src/protocols/oscar/oscar.c:3705
 #, 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:3713
+#: src/protocols/oscar/oscar.c:3714
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7818,83 +8025,88 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3723
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3732
 #, 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:3740
+#: src/protocols/oscar/oscar.c:3741
 #, 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:3801
+#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
+#, c-format
+msgid "Info for %s"
+msgstr "%s 的 ICQ 資訊"
+
+#: src/protocols/oscar/oscar.c:3803
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3860
+#: src/protocols/oscar/oscar.c:3864
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3861
+#: src/protocols/oscar/oscar.c:3865
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:3900
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:3959
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3978
+#: src/protocols/oscar/oscar.c:3982
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:3985
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3985 src/protocols/yahoo/yahoo_profile.c:898
+#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:4067
+#: src/protocols/oscar/oscar.c:4073
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4253
+#: src/protocols/oscar/oscar.c:4259
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4476
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4477
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7902,142 +8114,142 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:4540
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:4542
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:4568
+#: src/protocols/oscar/oscar.c:4573
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4838 src/protocols/oscar/oscar.c:4845
+#: src/protocols/oscar/oscar.c:4843 src/protocols/oscar/oscar.c:4850
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4850 src/protocols/silc/buddy.c:1555
+#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4851
+#: src/protocols/oscar/oscar.c:4856
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4857 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4873
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4872
-msgid "Additional Information"
-msgstr "其他資訊"
-
 #: src/protocols/oscar/oscar.c:4877
+msgid "Additional Information"
+msgstr "其他資訊"
+
+#: src/protocols/oscar/oscar.c:4882
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4881 src/protocols/oscar/oscar.c:4889
+#: src/protocols/oscar/oscar.c:4886 src/protocols/oscar/oscar.c:4894
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4885
+#: src/protocols/oscar/oscar.c:4890
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4893
+#: src/protocols/oscar/oscar.c:4898
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4894
+#: src/protocols/oscar/oscar.c:4899
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4900
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:4901
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4903
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4904
+#: src/protocols/oscar/oscar.c:4909
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:4958
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4975
+#: src/protocols/oscar/oscar.c:4979
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:4983
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:5000
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:5017
+#: src/protocols/oscar/oscar.c:5021
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:5019
+#: src/protocols/oscar/oscar.c:5023
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5051
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5054
 #, 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:5053
+#: src/protocols/oscar/oscar.c:5057
 #, 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:5056
+#: src/protocols/oscar/oscar.c:5060
 #, 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:5059
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8045,7 +8257,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:5062
+#: src/protocols/oscar/oscar.c:5066
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8053,19 +8265,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5069
 #, 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:5068
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8074,25 +8286,25 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5079 src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:5149
+#: src/protocols/oscar/oscar.c:5153
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:5322
+#: src/protocols/oscar/oscar.c:5326
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5327
 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 "
@@ -8101,7 +8313,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5354
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8112,19 +8324,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5355
+#: src/protocols/oscar/oscar.c:5359
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:5371 src/protocols/oscar/oscar.c:6651
+#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:5389
+#: src/protocols/oscar/oscar.c:5393
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:5390
+#: src/protocols/oscar/oscar.c:5394
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8133,7 +8345,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:5430
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8144,11 +8356,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5439
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:5521
+#: src/protocols/oscar/oscar.c:5517
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8159,16 +8371,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:5522 src/protocols/oscar/oscar.c:5939
-#: src/protocols/oscar/oscar.c:5952
+#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5972
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5658
+#: src/protocols/oscar/oscar.c:5678
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5659
+#: src/protocols/oscar/oscar.c:5679
 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 "
@@ -8177,13 +8389,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5835 src/protocols/oscar/oscar.c:5836
-#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:5996
-#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
+#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5938
+#: src/protocols/oscar/oscar.c:5958
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8192,11 +8404,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5938 src/protocols/oscar/oscar.c:5951
+#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5951
+#: src/protocols/oscar/oscar.c:5971
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8206,7 +8418,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:6033
+#: src/protocols/oscar/oscar.c:6053
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8216,11 +8428,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:6039
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:6072
+#: src/protocols/oscar/oscar.c:6092
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8230,18 +8442,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6114
+#: src/protocols/oscar/oscar.c:6134
 #, 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:6115
+#: src/protocols/oscar/oscar.c:6135
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6138
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8251,74 +8463,74 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6119
+#: src/protocols/oscar/oscar.c:6139
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:6156 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6198
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:6268
+#: src/protocols/oscar/oscar.c:6288
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:6425
+#: src/protocols/oscar/oscar.c:6445
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6709
+#: src/protocols/oscar/oscar.c:6729
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6727
+#: src/protocols/oscar/oscar.c:6747
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6733
+#: src/protocols/oscar/oscar.c:6753
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6745
+#: src/protocols/oscar/oscar.c:6765
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6768
+#: src/protocols/oscar/oscar.c:6788
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6798
+#: src/protocols/oscar/oscar.c:6818
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6819
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6806
+#: src/protocols/oscar/oscar.c:6826
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6858
+#: src/protocols/oscar/oscar.c:6878
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6903
+#: src/protocols/oscar/oscar.c:6923
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6906
+#: src/protocols/oscar/oscar.c:6926
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6907
+#: src/protocols/oscar/oscar.c:6927
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8326,76 +8538,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6924
+#: src/protocols/oscar/oscar.c:6944
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6925
+#: src/protocols/oscar/oscar.c:6945
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6926
+#: src/protocols/oscar/oscar.c:6946
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6943
+#: src/protocols/oscar/oscar.c:6963
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6944
+#: src/protocols/oscar/oscar.c:6964
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:786
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:7030
+#: src/protocols/oscar/oscar.c:7050
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7036
+#: src/protocols/oscar/oscar.c:7056
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:782
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7066
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7070
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:7079
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:7063
+#: src/protocols/oscar/oscar.c:7083
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:7067
+#: src/protocols/oscar/oscar.c:7087
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:7071
+#: src/protocols/oscar/oscar.c:7091
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:7078
+#: src/protocols/oscar/oscar.c:7098
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:7084
+#: src/protocols/oscar/oscar.c:7104
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:7089
+#: src/protocols/oscar/oscar.c:7109
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8409,15 +8621,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:7204 src/protocols/oscar/oscar.c:7206
+#. *  description
+#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7225
+#: src/protocols/oscar/oscar.c:7246
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7230
+#: src/protocols/oscar/oscar.c:7251
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -8504,32 +8717,32 @@
 msgstr "設定即時訊息密碼"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1133 src/protocols/silc/ops.c:1144
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1092
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1134
+#: src/protocols/silc/ops.c:1145
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1650
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:991
-#: src/protocols/silc/chat.c:218
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:219
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
-#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
-#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
-#: src/protocols/silc/ops.c:999
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:847
+#: src/protocols/silc/ops.c:918 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/ops.c:1002 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/ops.c:1009
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:919
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
@@ -8546,204 +8759,204 @@
 "直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
 "鑰」指令即可。"
 
-#: src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1035
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
 
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr "匯入..."
 
+#: src/protocols/silc/buddy.c:1125
+msgid "Select correct user"
+msgstr "選擇正確的使用者"
+
 #: src/protocols/silc/buddy.c:1127
-msgid "Select correct user"
-msgstr "選擇正確的使用者"
-
-#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1131
+#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1405
+#: src/protocols/silc/buddy.c:1377
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: src/protocols/silc/buddy.c:1417
+#: src/protocols/silc/buddy.c:1389
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492
-#: src/protocols/silc/silc.c:606
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
+#: src/protocols/silc/silc.c:610
 msgid "Happy"
 msgstr "開心"
 
-#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494
-#: src/protocols/silc/silc.c:608
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
+#: src/protocols/silc/silc.c:612
 msgid "Sad"
 msgstr "憂愁"
 
-#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496
-#: src/protocols/silc/silc.c:610
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/silc.c:614
 msgid "Angry"
 msgstr "憤怒"
 
-#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
+#: src/protocols/silc/silc.c:616
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
+#: src/protocols/silc/silc.c:618
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502
-#: src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
+#: src/protocols/silc/silc.c:620
 msgid "Invincible"
 msgstr "無敵"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504
-#: src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
+#: src/protocols/silc/silc.c:622
 msgid "In Love"
 msgstr "戀愛中"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506
-#: src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
+#: src/protocols/silc/silc.c:624
 msgid "Sleepy"
 msgstr "想睡"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508
-#: src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/silc.c:626
 msgid "Bored"
 msgstr "發悶"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510
-#: src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
+#: src/protocols/silc/silc.c:628
 msgid "Excited"
 msgstr "興奮"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/buddy.c:1512
-#: src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
+#: src/protocols/silc/silc.c:630
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/buddy.c:1452
 msgid "Modes"
 msgstr "模式"
 
+#: src/protocols/silc/buddy.c:1462
+msgid "Mood"
+msgstr "心情"
+
 #: src/protocols/silc/buddy.c:1490
-msgid "Mood"
-msgstr "心情"
-
-#: src/protocols/silc/buddy.c:1520
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: src/protocols/silc/buddy.c:1525
+#: src/protocols/silc/buddy.c:1495
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: src/protocols/silc/buddy.c:1533
+#: src/protocols/silc/buddy.c:1503
 msgid "Paging"
 msgstr "傳呼"
 
-#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:641
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:643
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:645
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: src/protocols/silc/buddy.c:1546
+#: src/protocols/silc/buddy.c:1515
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: src/protocols/silc/buddy.c:1551
+#: src/protocols/silc/buddy.c:1520
 msgid "Device"
 msgstr "所用裝置"
 
-#: src/protocols/silc/buddy.c:1553
+#: src/protocols/silc/buddy.c:1522
 msgid "Computer"
 msgstr "電腦"
 
-#: src/protocols/silc/buddy.c:1557
+#: src/protocols/silc/buddy.c:1526
 msgid "PDA"
 msgstr "電子手帳"
 
-#: src/protocols/silc/buddy.c:1559
+#: src/protocols/silc/buddy.c:1528
 msgid "Terminal"
 msgstr "終端機"
 
-#: src/protocols/silc/buddy.c:1570 src/protocols/silc/silc.c:674
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:678
+#: src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "時區"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1545
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: src/protocols/silc/buddy.c:1635
+#: src/protocols/silc/buddy.c:1604
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:1640
+#: src/protocols/silc/buddy.c:1609
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: src/protocols/silc/buddy.c:1644
+#: src/protocols/silc/buddy.c:1613
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:1655
+#: src/protocols/silc/buddy.c:1624
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1660
+#: src/protocols/silc/buddy.c:1629
 msgid "Send File..."
 msgstr "傳送檔案..."
 
-#: src/protocols/silc/buddy.c:1665 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1182
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
@@ -8765,24 +8978,91 @@
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: src/protocols/silc/chat.c:217
+#: src/protocols/silc/chat.c:104
+#, c-format
+msgid "Channel Name:\t\t%s\n"
+msgstr "頻道名稱:%s\n"
+
+#: src/protocols/silc/chat.c:106
+#, c-format
+msgid "User Count:\t\t%d\n"
+msgstr "使用者數:%s\n"
+
+#: src/protocols/silc/chat.c:112
+#, c-format
+msgid "Channel Founder:\t%s\n"
+msgstr "頻道創立者:%s\n"
+
+#: src/protocols/silc/chat.c:120
+#, c-format
+msgid "Channel Cipher:\t\t%s\n"
+msgstr "頻道加密方式 (Cipher):%s\n"
+
+#: src/protocols/silc/chat.c:123
+#, c-format
+msgid "Channel HMAC:\t\t%s\n"
+msgstr "頻道身份驗證代碼 (HMAC):%s\n"
+
+#: src/protocols/silc/chat.c:127
+#, c-format
+msgid ""
+"\n"
+"Channel Topic:\n"
+"\t%s\n"
+msgstr ""
+"\n"
+"頻道主題:\n"
+"\t%s\n"
+
+#: src/protocols/silc/chat.c:130
+msgid ""
+"\n"
+"Channel Modes:\n"
+msgstr ""
+"\n"
+"頻道模式:\n"
+
+#: src/protocols/silc/chat.c:144
+#, c-format
+msgid ""
+"\n"
+"Founder Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"\n"
+"創立者之公鑰指紋:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/chat.c:145
+#, c-format
+msgid ""
+"Founder Key Babbleprint:\n"
+"%s"
+msgstr ""
+"\n"
+"創立者之公鑰指紋可讀版本 (Babbleprint):\n"
+"%s"
+
+#: src/protocols/silc/chat.c:218
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:272
+#: src/protocols/silc/chat.c:273
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: src/protocols/silc/chat.c:383
+#: src/protocols/silc/chat.c:382
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: src/protocols/silc/chat.c:390
+#: src/protocols/silc/chat.c:389
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: src/protocols/silc/chat.c:395
+#: src/protocols/silc/chat.c:394
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8795,123 +9075,127 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
-#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
+#: src/protocols/silc/chat.c:871
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
+#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+msgid "Add / Remove"
+msgstr "新增/移除"
+
 # XXX may be wrong
-#: src/protocols/silc/chat.c:562
+#: src/protocols/silc/chat.c:560
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1463
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:575
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: src/protocols/silc/chat.c:579
+#: src/protocols/silc/chat.c:577
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:706
+#: src/protocols/silc/chat.c:704
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:705
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: src/protocols/silc/chat.c:849
+#: src/protocols/silc/chat.c:847
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/silc/chat.c:856
+#: src/protocols/silc/chat.c:854
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:860
+#: src/protocols/silc/chat.c:858
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: src/protocols/silc/chat.c:867
+#: src/protocols/silc/chat.c:865
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: src/protocols/silc/chat.c:878
+#: src/protocols/silc/chat.c:876
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: src/protocols/silc/chat.c:882
+#: src/protocols/silc/chat.c:880
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:889
+#: src/protocols/silc/chat.c:887
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: src/protocols/silc/chat.c:894
+#: src/protocols/silc/chat.c:892
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: src/protocols/silc/chat.c:898
+#: src/protocols/silc/chat.c:896
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: src/protocols/silc/chat.c:904
+#: src/protocols/silc/chat.c:902
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:906
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: src/protocols/silc/chat.c:914
+#: src/protocols/silc/chat.c:912
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:916
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:988
+#: src/protocols/silc/chat.c:986
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:992
+#: src/protocols/silc/chat.c:990
 #, 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:1042
+#: src/protocols/silc/chat.c:1043
 #, 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:1044
+#: src/protocols/silc/chat.c:1045
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:1045
+#: src/protocols/silc/chat.c:1046
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+#: src/protocols/silc/chat.c:1239 src/protocols/silc/silc.c:885
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+#: src/protocols/silc/chat.c:1240 src/protocols/silc/silc.c:886
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -8962,224 +9246,224 @@
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
-#: src/protocols/silc/ops.c:338
+#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:340
+#: src/protocols/silc/ops.c:347
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: src/protocols/silc/ops.c:398
+#: src/protocols/silc/ops.c:407
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: src/protocols/silc/ops.c:402
+#: src/protocols/silc/ops.c:411
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:433
+#: src/protocols/silc/ops.c:442
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: src/protocols/silc/ops.c:437
+#: src/protocols/silc/ops.c:446
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:464
+#: src/protocols/silc/ops.c:473
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: src/protocols/silc/ops.c:494 src/protocols/silc/ops.c:499
-#: src/protocols/silc/ops.c:504
+#: src/protocols/silc/ops.c:503 src/protocols/silc/ops.c:508
+#: src/protocols/silc/ops.c:513
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
-#: src/protocols/silc/ops.c:535
+#: src/protocols/silc/ops.c:534 src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:544
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: src/protocols/silc/ops.c:581
+#: src/protocols/silc/ops.c:590
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: src/protocols/silc/ops.c:767
+#: src/protocols/silc/ops.c:777
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: src/protocols/silc/ops.c:790
+#: src/protocols/silc/ops.c:800
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:794
+#: src/protocols/silc/ops.c:804
 msgid "Job Title"
 msgstr "職銜"
 
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:808
 msgid "Job Role"
 msgstr "職責"
 
-#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+#: src/protocols/silc/ops.c:812
 msgid "Organization"
 msgstr "所屬機構"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:816
 msgid "Unit"
 msgstr "部門"
 
-#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+#: src/protocols/silc/ops.c:835
 msgid "EMail"
 msgstr "電子郵件"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:840
 msgid "Note"
 msgstr "備註"
 
-#: src/protocols/silc/ops.c:878
+#: src/protocols/silc/ops.c:888
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:933
+#: src/protocols/silc/ops.c:943
 msgid "Hostname"
 msgstr "主機名稱"
 
-#: src/protocols/silc/ops.c:940
+#: src/protocols/silc/ops.c:950
 msgid "User Mode"
 msgstr "使用者模式"
 
-#: src/protocols/silc/ops.c:954
+#: src/protocols/silc/ops.c:964
 msgid "Channels"
 msgstr "頻道"
 
-#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:292
+#: src/protocols/silc/ops.c:991
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:293
+#: src/protocols/silc/ops.c:992
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: src/protocols/silc/ops.c:995
+#: src/protocols/silc/ops.c:1005
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+#: src/protocols/silc/ops.c:1016 src/protocols/silc/silc.c:774
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:1006
+#: src/protocols/silc/ops.c:1016
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1017
+#: src/protocols/silc/ops.c:1027
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1098
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1045
+#: src/protocols/silc/ops.c:1098
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1093
+#: src/protocols/silc/ops.c:1146
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
-#: src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/ops.c:1173
+#: src/protocols/silc/ops.c:1174
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1107
+#: src/protocols/silc/ops.c:1160
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1128
+#: src/protocols/silc/ops.c:1183
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1205
+#: src/protocols/silc/ops.c:1265
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1210
+#: src/protocols/silc/ops.c:1270
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1219
+#: src/protocols/silc/ops.c:1279
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1254
+#: src/protocols/silc/ops.c:1314
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/ops.c:1374 src/protocols/silc/ops.c:1421
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1376
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: src/protocols/silc/ops.c:1363
+#: src/protocols/silc/ops.c:1423
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1464
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1433
+#: src/protocols/silc/ops.c:1493
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的客戶端程式"
 
-#: src/protocols/silc/ops.c:1436
+#: src/protocols/silc/ops.c:1496
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1499
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1442
+#: src/protocols/silc/ops.c:1502
 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:1445
+#: src/protocols/silc/ops.c:1505
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: src/protocols/silc/ops.c:1448
+#: src/protocols/silc/ops.c:1508
 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:1451
+#: src/protocols/silc/ops.c:1511
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: src/protocols/silc/ops.c:1453
+#: src/protocols/silc/ops.c:1513
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1455
+#: src/protocols/silc/ops.c:1515
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1466
+#: src/protocols/silc/ops.c:1526
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -9241,15 +9525,15 @@
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: src/protocols/silc/silc.c:602
+#: src/protocols/silc/silc.c:606
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:604
+#: src/protocols/silc/silc.c:608
 msgid "Normal"
 msgstr "正常"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9257,34 +9541,34 @@
 "\n"
 "聯絡方法"
 
-#: src/protocols/silc/silc.c:646
+#: src/protocols/silc/silc.c:650
 msgid "Your Current Status"
 msgstr "目前狀態"
 
-#: src/protocols/silc/silc.c:653
+#: src/protocols/silc/silc.c:657
 #, fuzzy
 msgid "Online Services"
 msgstr "上線自"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
-msgstr ""
+msgstr "讓其他人看到您目前正在使用什麼服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: src/protocols/silc/silc.c:662
+#: src/protocols/silc/silc.c:666
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:673
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
 #  XXX 好像很怪
-#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:686 src/protocols/silc/silc.c:687
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: src/protocols/silc/silc.c:684
+#: src/protocols/silc/silc.c:688
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9293,64 +9577,109 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:732
+#: src/protocols/silc/silc.c:1101 src/protocols/silc/silc.c:1106
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: src/protocols/silc/silc.c:723
+#: src/protocols/silc/silc.c:727 src/protocols/silc/silc.c:1101
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:724
+#: src/protocols/silc/silc.c:728 src/protocols/silc/silc.c:1102
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:769
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: src/protocols/silc/silc.c:749
+#: src/protocols/silc/silc.c:778
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:813
+#: src/protocols/silc/silc.c:850
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: src/protocols/silc/silc.c:907
+#: src/protocols/silc/silc.c:1216
+msgid "part:  Leave the chat"
+msgstr "part:離開聊天室"
+
+#: src/protocols/silc/silc.c:1220
+msgid "leave:  Leave the chat"
+msgstr "leave: 離開聊天室"
+
+#: src/protocols/silc/silc.c:1224
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
+
+#: src/protocols/silc/silc.c:1229
+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:1233
+msgid "list:  List channels on this network"
+msgstr "list:列出目前在網絡上的聊天室清單"
+
+#: src/protocols/silc/silc.c:1237
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
+
+#: src/protocols/silc/silc.c:1241
+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:1245
+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:1249
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
+
+#: src/protocols/silc/silc.c:1253
+msgid "detach:  Detach this session"
+msgstr "detach:暫停連線這個工作階段"
+
+#: src/protocols/silc/silc.c:1282
+msgid "umode &lt;usermodes&gt;:  Set your user options"
+msgstr "umode &lt;使用者選項&gt;:設定您的使用者選項"
+
+#: src/protocols/silc/silc.c:1335
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:912
+#: src/protocols/silc/silc.c:1340
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:917
+#: src/protocols/silc/silc.c:1345
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:920
+#: src/protocols/silc/silc.c:1348
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/silc.c:1353
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:930
+#: src/protocols/silc/silc.c:1358
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:933
+#: src/protocols/silc/silc.c:1361
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:938
+#: src/protocols/silc/silc.c:1366
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:943
+#: src/protocols/silc/silc.c:1371
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9364,76 +9693,114 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1026
+#: src/protocols/silc/silc.c:1455
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1028
+#: src/protocols/silc/silc.c:1457
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1058
+#: src/protocols/silc/silc.c:1487
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1064
+#: src/protocols/silc/silc.c:1493
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1068
+#: src/protocols/silc/silc.c:1497
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1073
+#: src/protocols/silc/silc.c:1502
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1076
+#: src/protocols/silc/silc.c:1505
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1079
+#: src/protocols/silc/silc.c:1508
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1082
+#: src/protocols/silc/silc.c:1511
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+#: src/protocols/silc/util.c:202 src/protocols/silc/util.c:227
 msgid "Creating SILC key pair..."
 msgstr "建立 SILC key pair 中..."
 
-#: src/protocols/silc/util.c:277
-msgid "Real Name"
-msgstr "姓名"
-
-#: src/protocols/silc/util.c:279
-msgid "User Name"
-msgstr "使用者名稱"
-
-#: src/protocols/silc/util.c:283
-msgid "Host Name"
-msgstr "主機名稱"
-
-#: src/protocols/silc/util.c:288
-msgid "Algorithm"
-msgstr "演算法"
-
-#: src/protocols/silc/util.c:289
-msgid "Key Length"
-msgstr "密鑰長度"
-
-#: src/protocols/silc/util.c:290
-#, c-format
-msgid "%d bits"
-msgstr "%d 個位元"
-
-#: src/protocols/silc/util.c:297 src/protocols/silc/util.c:298
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: src/protocols/silc/util.c:310
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "姓名:   \t%s\n"
+
+#: src/protocols/silc/util.c:312
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "使用者名稱:\t%s\n"
+
+#: src/protocols/silc/util.c:314
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr "電子郵件: \t%s\n"
+
+#: src/protocols/silc/util.c:316
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "主機名稱: \t%s\n"
+
+#: src/protocols/silc/util.c:318
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "所屬機構: \t%s\n"
+
+#: src/protocols/silc/util.c:320
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "國家:   \t%s\n"
+
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Algorithm: \t\t%s\n"
+msgstr "演算法:  \t%s\n"
+
+#: src/protocols/silc/util.c:322
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "密鑰長度: \t%d 個位元\n"
+
+#: src/protocols/silc/util.c:324
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"公鑰指紋:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/util.c:325
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"公鑰指紋可讀版本 (Babbleprint):\n"
+"%s"
+
+#: src/protocols/silc/util.c:329 src/protocols/silc/util.c:330
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
@@ -9571,19 +9938,19 @@
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:887
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:891
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:892
+#: src/protocols/toc/toc.c:895
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -9592,44 +9959,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1660
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1696
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1741 src/protocols/toc/toc.c:1781
-#: src/protocols/toc/toc.c:1905 src/protocols/toc/toc.c:1993
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1938
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2038
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2072
+#: src/protocols/toc/toc.c:2079
 #, 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:2079
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -9644,15 +10011,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#. *  description
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2180
+#: src/protocols/toc/toc.c:2188
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2184
+#: src/protocols/toc/toc.c:2192
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -9738,37 +10106,38 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#. *  description
+#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:300
+#: src/protocols/yahoo/yahoo.c:329
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已經被登出,因為您已在另一處登入。"
 
-#: src/protocols/yahoo/yahoo.c:742
+#: src/protocols/yahoo/yahoo.c:799
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:818
 msgid "Buzz!!"
 msgstr "嗶!"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:795
+#: src/protocols/yahoo/yahoo.c:861
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: src/protocols/yahoo/yahoo.c:861
+#: src/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:864
+#: src/protocols/yahoo/yahoo.c:930
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9777,11 +10146,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:867
+#: src/protocols/yahoo/yahoo.c:933
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1618
+#: src/protocols/yahoo/yahoo.c:1689
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9791,11 +10160,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1621
+#: src/protocols/yahoo/yahoo.c:1692
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1694
+#: src/protocols/yahoo/yahoo.c:1764
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9804,69 +10173,68 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1697
+#: src/protocols/yahoo/yahoo.c:1767
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1730
+#: src/protocols/yahoo/yahoo.c:1800
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1733
+#: src/protocols/yahoo/yahoo.c:1803
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-# XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:1736
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr "你的帳戶目前被封鎖。請您登入 Yahoo 網站。"
-
-#: src/protocols/yahoo/yahoo.c:1739
-#, c-format
-msgid "Unknown error number %d."
-msgstr "未知的錯誤代碼 %d。"
-
-#: src/protocols/yahoo/yahoo.c:1796
+#: src/protocols/yahoo/yahoo.c:1806
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
+
+#: src/protocols/yahoo/yahoo.c:1809
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+
+#: src/protocols/yahoo/yahoo.c:1863
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1798
+#: src/protocols/yahoo/yahoo.c:1865
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1963 src/protocols/yahoo/yahoo.c:2094
+#: src/protocols/yahoo/yahoo.c:2056 src/protocols/yahoo/yahoo.c:2184
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2226
-#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoo.c:2281
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2206 src/protocols/yahoo/yahoo.c:2316
+#: src/protocols/yahoo/yahoo.c:2366 src/protocols/yahoo/yahoo.c:2377
+#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2750
-#: src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2467 src/protocols/yahoo/yahoo.c:2848
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2752
-#: src/protocols/yahoo/yahoo.c:2863
+#: src/protocols/yahoo/yahoo.c:2469 src/protocols/yahoo/yahoo.c:2850
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2369 src/protocols/yahoo/yahoo.c:2754
-#: src/protocols/yahoo/yahoo.c:2864
+#: src/protocols/yahoo/yahoo.c:2471 src/protocols/yahoo/yahoo.c:2852
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2373 src/protocols/yahoo/yahoo.c:2758
-#: src/protocols/yahoo/yahoo.c:2866
+#: src/protocols/yahoo/yahoo.c:2475 src/protocols/yahoo/yahoo.c:2856
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2377 src/protocols/yahoo/yahoo.c:2762
-#: src/protocols/yahoo/yahoo.c:2868
+#: src/protocols/yahoo/yahoo.c:2479 src/protocols/yahoo/yahoo.c:2860
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -9874,11 +10242,11 @@
 # 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:2458 src/protocols/yahoo/yahoo.c:2490
+#: src/protocols/yahoo/yahoo.c:2560 src/protocols/yahoo/yahoo.c:2586
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2606
 #, c-format
 msgid ""
 "\n"
@@ -9889,30 +10257,30 @@
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/yahoo/yahoo.c:2679
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2586
+#: src/protocols/yahoo/yahoo.c:2684
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2646
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2655
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2665
+#: src/protocols/yahoo/yahoo.c:2760
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2669
+#: src/protocols/yahoo/yahoo.c:2764
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
@@ -9926,120 +10294,111 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3184 src/protocols/yahoo/yahoo.c:3186
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3288 src/protocols/yahoo/yahoo.c:3290
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3205
+#: src/protocols/yahoo/yahoo.c:3309
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3208
+#: src/protocols/yahoo/yahoo.c:3312
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3211
+#: src/protocols/yahoo/yahoo.c:3315
 msgid "Japan Pager host"
 msgstr "傳呼系統伺服器(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3214
+#: src/protocols/yahoo/yahoo.c:3318
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3217
+#: src/protocols/yahoo/yahoo.c:3321
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3220
+#: src/protocols/yahoo/yahoo.c:3324
 msgid "Japan File transfer host"
 msgstr "檔案傳輸主機(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3223
+#: src/protocols/yahoo/yahoo.c:3327
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3226
+#: src/protocols/yahoo/yahoo.c:3330
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr "Gaim 無法透過 Yahoo! 傳送大於 1MB (104,8576 個位元組) 的檔案。"
 
-#: src/protocols/yahoo/yahoo_profile.c:661
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
-msgstr "<b>對不起,暫時並不支援內容被列為兒童不宜的個人資訊。</b><br><br>\n"
-
-# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: src/protocols/yahoo/yahoo_profile.c:662
-#: src/protocols/yahoo/yahoo_profile.c:699
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結<br>"
-
-#: src/protocols/yahoo/yahoo_profile.c:697
-msgid ""
-"<b>Sorry, this profile seems to be in a language that is not supported at "
-"this time.</b><br><br>\n"
-msgstr "<b>對不起,這則個人資訊似乎是在使用一種未被支援的語文。</b><br><br>\n"
-
-#: src/protocols/yahoo/yahoo_profile.c:771
-#: src/protocols/yahoo/yahoo_profile.c:772
+#: src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:961
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo_profile.c:772
-#: src/protocols/yahoo/yahoo_profile.c:785
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b>%s<br>"
-
-#: src/protocols/yahoo/yahoo_profile.c:780 src/protocols/zephyr/zephyr.c:560
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>別名:</b>%s<br>"
-
-#: src/protocols/yahoo/yahoo_profile.c:835
-#: src/protocols/yahoo/yahoo_profile.c:838
-#: src/protocols/yahoo/yahoo_profile.c:841
+#: src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP 位址:</b>%s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:779
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資訊。"
+
+# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
+#: src/protocols/yahoo/yahoo_profile.c:781
+#: src/protocols/yahoo/yahoo_profile.c:829
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結"
+
+#: src/protocols/yahoo/yahoo_profile.c:827
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr "對不起,這則個人資訊似乎是使用目前尚未被支援的語言。"
+
+#: src/protocols/yahoo/yahoo_profile.c:1038
+#: src/protocols/yahoo/yahoo_profile.c:1042
+#: src/protocols/yahoo/yahoo_profile.c:1046
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo_profile.c:850
-#: src/protocols/yahoo/yahoo_profile.c:853
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo_profile.c:872
+#: src/protocols/yahoo/yahoo_profile.c:1081
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo_profile.c:886
+#: src/protocols/yahoo/yahoo_profile.c:1096
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo_profile.c:890
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo_profile.c:892
+#: src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-#. put a link to the actual profile URL
-#: src/protocols/yahoo/yahoo_profile.c:905 src/util.c:789
-#, c-format
-msgid "<b>%s:</b> "
-msgstr "<b>%s:</b>"
-
-#: src/protocols/yahoo/yahoo_profile.c:905
-msgid "Profile URL"
-msgstr "個人資料網址"
+# NOTE 譯文更動 by Ambrose
+#: src/protocols/yahoo/yahoo_profile.c:1138
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "無法取得使用者 %s 的個人資訊"
 
 #: src/protocols/yahoo/yahoochat.c:198
 #, c-format
@@ -10058,71 +10417,76 @@
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:426
+#: src/protocols/yahoo/yahoochat.c:424
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:578
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1346
+#: src/protocols/yahoo/yahoochat.c:1344
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1349
+#: src/protocols/yahoo/yahoochat.c:1347
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
 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:1414
+#: src/protocols/yahoo/yahoochat.c:1412
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: src/protocols/zephyr/zephyr.c:558
+#: src/protocols/zephyr/zephyr.c:566
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr "無法傳送至聊天室 %s,%s,%s"
+
+#: src/protocols/zephyr/zephyr.c:600
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:562
+#: src/protocols/zephyr/zephyr.c:604
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:608
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
+#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid "Already logged in with Zephyr"
 msgstr "已經登入 Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -10133,18 +10497,18 @@
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:1191
+#: src/protocols/zephyr/zephyr.c:1232
 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:1197
+#: src/protocols/zephyr/zephyr.c:1238
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:1244
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
@@ -10158,7 +10522,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
+#. *  description
+#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -10168,18 +10533,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:1374
+#: src/protocols/zephyr/zephyr.c:1433
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1436
 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:1380
+#: src/protocols/zephyr/zephyr.c:1439
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -10195,11 +10560,11 @@
 msgid "Proxy connection error %d"
 msgstr "代理伺服器連線錯誤 %d"
 
-#: src/proxy.c:1486
+#: src/proxy.c:1495
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: src/proxy.c:1486
+#: src/proxy.c:1495
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10207,7 +10572,7 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:177
+#: src/prpl.h:205
 msgid "Custom"
 msgstr "使用者自定"
 
@@ -10218,67 +10583,67 @@
 msgid "Accept"
 msgstr "接受"
 
-#: src/server.c:60
+#: src/server.c:63
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:502
+#: src/server.c:528
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: src/server.c:923
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:937
+#: src/server.c:952
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1103 src/server.c:1113
+#: src/server.c:1176 src/server.c:1186
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1126
+#: src/server.c:1199
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1142
+#: src/server.c:1215
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1144
+#: src/server.c:1217
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1158
+#: src/server.c:1231
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/server.c:1170
+#: src/server.c:1243
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1181 src/server.c:1189
+#: src/server.c:1254 src/server.c:1262
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1203
+#: src/server.c:1276
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1265
+#: src/server.c:1338
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10287,11 +10652,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1268
+#: src/server.c:1341
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1378
+#: src/server.c:1451
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10300,12 +10665,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1382
+#: src/server.c:1455
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1388
+#: src/server.c:1461
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -10332,33 +10697,33 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2287
+#: src/util.c:2363
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2290
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2321 src/util.c:2326 src/util.c:2331 src/util.c:2334
+#: src/util.c:2399
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2322 src/util.c:2326 src/util.c:2340 src/util.c:2342
+#: src/util.c:2407
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2322 src/util.c:2331 src/util.c:2340 src/util.c:2345
+#: src/util.c:2415
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2682
+#: src/util.c:2825
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -10374,6 +10739,65 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "Buddy icon file:"
+#~ msgstr "好友圖示檔案:"
+
+#~ msgid "_Browse"
+#~ msgstr "瀏覽(_B)"
+
+#~ msgid "_Reset"
+#~ msgstr "重置(_R)"
+
+#~ msgid "Show IMs and chats in _same tabbed window"
+#~ msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
+
+#~ msgid "New window _placement:"
+#~ msgstr "新視窗位置(_P):"
+
+#  FIXME 譯文有待改進
+#~ msgid "Number of conversations per window:"
+#~ msgstr "視窗內之交談個數上限:"
+
+#~ msgid ""
+#~ "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
+#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+#~ msgstr ""
+#~ "<B>支援的 IRC 指令:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
+#~ "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE "
+#~ "TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+
+#~ msgid ""
+#~ "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+#~ msgstr ""
+#~ "<B>支援的 IRC 指令:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
+#~ "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+
+#~ msgid "No help is available at this time for this command."
+#~ msgstr "暫時未有為這個指令提供說明。"
+
+#~ msgid "Change your nickname"
+#~ msgstr "修改暱稱"
+
+#~ msgid "<html><body><b>Error retrieving profile</b></body></html>"
+#~ msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
+
+#~ msgid "Real Name"
+#~ msgstr "姓名"
+
+#~ msgid "User Name"
+#~ msgstr "使用者名稱"
+
+#~ msgid "Host Name"
+#~ msgstr "主機名稱"
+
+#~ msgid "%d bits"
+#~ msgstr "%d 個位元"
+
+#~ msgid "Unknown error number %d."
+#~ msgstr "未知的錯誤代碼 %d。"
+
 #~ msgid "Syntax error"
 #~ msgstr "語法錯誤"
 
@@ -10515,9 +10939,6 @@
 #~ msgid "Tel:\t\t\t%s\n"
 #~ msgstr "電話:   \t%s\n"
 
-#~ msgid "EMail:\t\t%s\n"
-#~ msgstr "電子郵件: \t%s\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Note:\t\t%s\n"
@@ -10525,15 +10946,6 @@
 #~ "\n"
 #~ "備註:   \t%s\n"
 
-#~ msgid "Real Name:\t%s\n"
-#~ msgstr "姓名:   \t%s\n"
-
-#~ msgid "Username:\t\t%s\n"
-#~ msgstr "使用者名稱:\t%s\n"
-
-#~ msgid "Hostname:\t\t%s\n"
-#~ msgstr "主機名稱: \t%s\n"
-
 #~ msgid "Server:\t\t%s\n"
 #~ msgstr "伺服器:  \t%s\n"