changeset 9660:903bfc7af0e2

[gaim-migrate @ 10508] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 04 Aug 2004 02:46:35 +0000
parents 0a82c4662c0d
children 52319a1d9a55
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 1483 insertions(+), 1417 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Wed Aug 04 02:16:56 2004 +0000
+++ b/po/ChangeLog	Wed Aug 04 02:46:35 2004 +0000
@@ -2,6 +2,7 @@
 
 version 0.81cvs
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Japanese translation updated (Takeshi Aihana)
--- a/po/zh_TW.po	Wed Aug 04 02:16:56 2004 +0000
+++ b/po/zh_TW.po	Wed Aug 04 02:46:35 2004 +0000
@@ -41,9 +41,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.80\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
+"Project-Id-Version: Gaim 0.81cvs\n"
+"POT-Creation-Date: 2004-08-03 00:00-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"
@@ -53,18 +52,23 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "錯誤訊息抑遏"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "不顯示中斷連線錯誤"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "不顯示登入錯誤"
 
+#  XXX 暫譯
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "再連線時還原離線前之原有狀態"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -86,7 +90,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "自動重新連線"
 
@@ -94,7 +98,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "當你斷線時,系統會自動幫你重新連線。"
 
@@ -200,7 +204,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 離開"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "自動登入"
 
@@ -216,21 +220,21 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2722
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6494 src/protocols/oscar/oscar.c:6694
 #: 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:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6702
 msgid "Back"
 msgstr "返回"
 
@@ -242,11 +246,11 @@
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -312,7 +316,7 @@
 #  XXX 要核實譯文!
 #: plugins/extplacement.c:107
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "按交談個數放置交談時,以不同的視窗顯示即時訊息和聊天"
+msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
 
 #. *< api_version
 #. *< type
@@ -359,23 +363,23 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "允許您在檔案中輸入指令以控制 Gaim。"
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "沒有連到 AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "沒有給予帳號。"
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "沒有給予聊天室名稱。"
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "無效的 AIM URI"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -384,7 +388,7 @@
 "指定 %s 到 Socket 失敗:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "無法開啟 Socket"
 
@@ -395,19 +399,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "遠端控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "提供對 Gaim 應用程式進行遠端控制。"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -511,15 +515,15 @@
 #: 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:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
@@ -538,13 +542,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6978
 msgid "Search"
 msgstr "搜尋"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
-#: src/gtkblist.c:4374
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4044
+#: src/gtkblist.c:4372
 msgid "Group:"
 msgstr "群組:"
 
@@ -588,7 +592,7 @@
 msgstr "聯結好友 (_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "好友"
@@ -611,7 +615,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "帳號"
 
@@ -660,8 +664,8 @@
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -728,7 +732,7 @@
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -898,14 +902,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
@@ -995,7 +999,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -1003,7 +1007,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -1084,7 +1088,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
@@ -1092,7 +1096,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -1115,26 +1119,38 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 已經離開。"
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 由離開返回。"
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 變更狀態為閒置。"
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 由閒置返回。"
 
+#: plugins/statenotify.c:69
+msgid "Notify When"
+msgstr "何時通知"
+
+#: plugins/statenotify.c:72
+msgid "Buddy Goes _Away"
+msgstr "好友離開(_A)"
+
+#: plugins/statenotify.c:75
+msgid "Buddy Goes _Idle"
+msgstr "好友閒置(_I)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1142,7 +1158,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "好友狀態通知"
 
@@ -1150,7 +1166,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1238,7 +1254,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -1290,8 +1306,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1310,8 +1326,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "交談"
 
@@ -1331,12 +1347,12 @@
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:95
+#: src/about.c:94
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1347,130 +1363,130 @@
 "佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/about.c:106
+#: src/about.c:105
 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:111
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "現任開發者"
 
-#: src/about.c:112
+#: src/about.c:111
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "主要開發者"
 
+#: src/about.c:116
+msgid "developer & webmaster"
+msgstr "開發者兼網站管理員"
+
 #: src/about.c:117
-msgid "developer & webmaster"
-msgstr "開發者兼網站管理員"
-
-#: src/about.c:118
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "開發者"
 
-#: src/about.c:125
+#: src/about.c:124
 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:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:148
+#: src/about.c:147
 msgid "Retired Developers"
 msgstr "前任開發者"
 
+#: src/about.c:148
+msgid "former libfaim maintainer"
+msgstr "前 libfaim 維護者"
+
 #: src/about.c:149
-msgid "former libfaim maintainer"
-msgstr "前 libfaim 維護者"
-
-#: src/about.c:150
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:154
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "前 Jabber 開發者"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: src/about.c:167 src/about.c:206
+#: src/about.c:166 src/about.c:205
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:168 src/about.c:207
+#: src/about.c:167 src/about.c:206
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:170
+#: src/about.c:169
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:171
+#: src/about.c:170
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "西班牙文"
 
+#: src/about.c:174 src/about.c:210
+msgid "Finnish"
+msgstr "芬蘭文"
+
 #: src/about.c:175 src/about.c:211
-msgid "Finnish"
-msgstr "芬蘭文"
-
-#: src/about.c:176 src/about.c:212
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:177
+#: src/about.c:176
 msgid "Hebrew"
 msgstr "希伯來文"
 
+#: src/about.c:177
+msgid "Hindi"
+msgstr "北印度文"
+
 #: src/about.c:178
-msgid "Hindi"
-msgstr "北印度文"
-
-#: src/about.c:179
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -1478,58 +1494,58 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/about.c:180 src/about.c:213
+#: src/about.c:179 src/about.c:212
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/about.c:181 src/about.c:214
+#: src/about.c:180 src/about.c:213
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:185
+#: src/about.c:184
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:186
+#: src/about.c:185
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:189
+#: src/about.c:188
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:190
+#: src/about.c:189
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:192
+#: src/about.c:191
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
@@ -1537,44 +1553,44 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/about.c:193
+#: src/about.c:192
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "越南文"
 
+#: src/about.c:194
+msgid "and the Gnome-Vi Team"
+msgstr "及 Gnome 越南文翻譯小組之其他組員"
+
 #: src/about.c:195
-msgid "and the Gnome-Vi Team"
-msgstr "及 Gnome 越南文翻譯小組之其他組員"
-
-#: src/about.c:196
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:197
+#: src/about.c:196
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:204
+#: src/about.c:203
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:205
+#: src/about.c:204
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "中文"
 
@@ -1611,46 +1627,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6765 src/protocols/oscar/oscar.c:6857
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6995
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: 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:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: 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/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6766
+#: src/protocols/oscar/oscar.c:6858 src/protocols/oscar/oscar.c:6910
+#: src/protocols/oscar/oscar.c:6979 src/protocols/oscar/oscar.c:6996
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "取消"
@@ -1665,34 +1681,34 @@
 msgid "Save"
 msgstr "儲存"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "離開!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "我回來了!"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "您確定要移除離開訊息「%s」?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "移除"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "新的離開訊息"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "全部設為離開"
 
@@ -1700,7 +1716,7 @@
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1715,23 +1731,18 @@
 "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及"
 "群組沒有被移除。\n"
 
-#: src/blist.c:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "未知"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 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:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
@@ -1753,11 +1764,11 @@
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "無法送出訊息。這個訊息太大了。"
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1766,7 +1777,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1776,58 +1787,58 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "依帳號"
 
@@ -1903,103 +1914,103 @@
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "讀取使用者日誌"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:625
+#: src/dialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: src/dialogs.c:782
-msgid "_Use"
-msgstr "使用(_U)"
-
 #: src/dialogs.c:804
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
@@ -2068,25 +2079,32 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
-"使用方式: %s command [OPTIONS] [URI]\n"
+"使用方式: %s 指令 [選項] [網址]\n"
 "\n"
 "    指令:\n"
-"       uri                      Handle AIM: URI\n"
+"       uri                      處理 AIM: 類型的網址\n"
+"       away                     進入預設的離開狀態並彈出離開視窗\n"
+"       back                     由離開返回並移除離開視窗\n"
 "       quit                     關閉正在執行的 Gaim\n"
 "\n"
 "    選項:\n"
-"       -h, --help [commmand]    顯示指令的說明\n"
-
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+"       -h, --help [指令]        顯示指令的說明\n"
+
+#  NOTE 譯文更動 by Ambrose
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
-msgstr "Gaim 並未執行(在工作階段 0)\n"
-
-#: src/gaim-remote.c:203
+msgstr "(在工作階段 0)Gaim 未有執行\n"
+
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2127,7 +2145,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "提示您加入「Penguin」到您的好友清單中。\n"
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2135,28 +2153,12 @@
 "\n"
 "關閉正在執行的 Gaim\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
-msgid "sorry, i ran out for a while. bbl"
-msgstr "不好意思,我離開一下下。"
-
-#: src/gaimrc.c:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr "無聊(預設)"
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "依照字母"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "依照狀態"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "依照日誌大小"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
+msgid "Unknown"
+msgstr "未知"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2168,168 +2170,168 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4016
 msgid "Screen Name:"
 msgstr "帳號:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4030 src/gtkblist.c:4358
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "如果您看得夠仔細"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "修改帳號"
 
 #  NOTE 譯文更動 by Ambrose
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "顯示細節"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "隱藏細節"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:6693 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "上線"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, 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:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2339,232 +2341,232 @@
 "\n"
 "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "資訊"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4409 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1130
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2327
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2328
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2329
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2331
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2332
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2333
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2334
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2335
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2337
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2338
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2341
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2342
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2343
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2344
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具/帳號相關指令(_T)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2345
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/工具/模組相關指令(_U)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2347
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2348
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2349
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2350
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2351
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2356
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2357
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2358
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2359
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2573,7 +2575,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2581,12 +2583,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2594,7 +2596,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2602,7 +2604,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2610,7 +2612,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2618,7 +2620,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2626,7 +2628,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2634,7 +2636,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2642,7 +2644,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2650,7 +2652,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2658,7 +2660,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2666,96 +2668,108 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "依照字母"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "依照狀態"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "依照日誌大小"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/工具/離開"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/工具/好友狀態捕捉"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/工具/帳號相關指令"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/工具/離開"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/工具/好友狀態捕捉"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/工具/帳號相關指令"
-
-#: src/gtkblist.c:3094
 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:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3970 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:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3996
+#: src/gtkblist.c:3994
 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. "
@@ -2765,41 +2779,41 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4056 src/gtkblist.c:4340
+#: src/gtkblist.c:4054 src/gtkblist.c:4338
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4299
+#: src/gtkblist.c:4297
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4306
+#: src/gtkblist.c:4304
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4330
+#: src/gtkblist.c:4328
 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:4408
+#: src/gtkblist.c:4406
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4409
+#: src/gtkblist.c:4407
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:4976 src/gtkblist.c:5073
+#: src/gtkblist.c:4974 src/gtkblist.c:5071
 msgid "No actions available"
 msgstr "沒有相關指令"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "完成。"
 
@@ -2811,16 +2825,16 @@
 msgid "Signon"
 msgstr "登入"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "全部取消"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
 # XXX 暫譯
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2833,15 +2847,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "理由不明。"
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "全部重新連線(_A)"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "時間"
 
@@ -2854,7 +2868,11 @@
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項為:version"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "(在這個情況下)沒有這個指令"
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2862,11 +2880,7 @@
 "要獲得某一指令的說明,可輸入「/help &lt;指令&gt;。\n"
 "在這個情況下,可用的指令如下:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "(在這個情況下)沒有這個指令"
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2875,7 +2889,7 @@
 "沒有這個指令。假如你無意輸入指令,你可以透過「工具→偏好設定→介面→交談→使用"
 "『斜線』指令」選項停止指令輸入的功能。"
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2884,387 +2898,384 @@
 "語法錯誤:輸入的參數少於指令所需的參數數量。假如你無意輸入指令,你可以透過"
 "「工具→偏好設定→介面→交談→使用『斜線』指令」選項停止指令輸入的功能。"
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "指令的執行因為不明原因失敗。"
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: src/gtkconv.c:804
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "即時訊息"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
+#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
-msgstr "忽略使用者"
+msgstr "忽略"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/交談/清空"
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/選項/顯示時間戳記(_I)"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
 msgstr "傳送檔案至使用者"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help:列出可用的指令。"
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
@@ -3290,11 +3301,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3355,36 +3366,36 @@
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:920
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "失敗"
 
@@ -3414,22 +3425,22 @@
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
@@ -3445,102 +3456,102 @@
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "插入表情"
 
-# NOTE 這個處理的手法係由芬蘭文現任譯者Arto Alakulju提供的
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "交談:"
+#, c-format
+msgid "Conversations with %s"
+msgstr "與 %s 的交談"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -3584,22 +3595,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -3613,7 +3624,7 @@
 msgstr "請輸入一個好友以進行捕捉。"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
@@ -3622,138 +3633,138 @@
 msgstr "編輯好友狀態捕捉"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "要捕捉誰的狀態"
 
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "捕捉什麼樣的狀態"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
-msgstr "登入(_S)"
-
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
+msgstr "登入(_G)"
+
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "登出(_O)"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
-msgstr "由離開返回(_T)"
-
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
+msgid "_Return from away"
+msgstr "由離開返回(_R)"
+
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "由閒置返回(_N)"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "好友開始輸入(_T)"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "好友停止輸入(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "捕捉動作"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "開啟即時訊息視窗(_E)"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "瀏覽(_R)..."
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "瀏覽(_W)..."
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "瀏覽(_W)..."
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "儲存設定並啟動(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "移除好友狀態捕捉"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
@@ -3777,8 +3788,8 @@
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "描述"
 
@@ -3794,303 +3805,299 @@
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "忽略顏色(_O)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "忽略字體(_F)"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "忽略字體大小(_Z)"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "忽略所收訊息的格式化(_I)"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "預設格式"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "送出訊息時使用預設格式化(_S)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #  XXX 暫譯
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "清除格式化(_C)"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "送出訊息"
 
+#: src/gtkprefs.c:908
+msgid "Enter _sends message"
+msgstr "按下 Enter 送出訊息(_S)"
+
+#: src/gtkprefs.c:910
+msgid "C_ontrol-Enter sends message"
+msgstr "按下 Ctrl-Enter 送出訊息(_O)"
+
 #: src/gtkprefs.c:913
-msgid "Enter _sends message"
-msgstr "按下 Enter 送出訊息(_S)"
-
-#: src/gtkprefs.c:915
-msgid "C_ontrol-Enter sends message"
-msgstr "按下 Ctrl-Enter 送出訊息(_O)"
-
-#: src/gtkprefs.c:918
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:914
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:917
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:918
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "使用「斜線」指令(_S)"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "顯示格式工具列(_F)"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "在標題和標籤上顯示別名(_A)"
 
+#: src/gtkprefs.c:1022
+msgid "Enable buddy ic_on animation"
+msgstr "啟動好友圖示動畫(_O)"
+
+#: src/gtkprefs.c:1024
+msgid "_Notify buddies that you are typing to them"
+msgstr "通知您的好友您正在發訊息給他們(_N)"
+
+#: src/gtkprefs.c:1026
+msgid "_Raise IM window on events"
+msgstr "當事件發生時,將視窗提到最上方(_R)"
+
 #: src/gtkprefs.c:1029
-msgid "Enable buddy ic_on animation"
-msgstr "啟動好友圖示動畫(_O)"
+msgid "Raise chat _window on events"
+msgstr "當事件發生時,將交談視窗提到最上方(_R)"
 
 #: src/gtkprefs.c:1031
-msgid "_Notify buddies that you are typing to them"
-msgstr "通知您的好友您正在發訊息給他們(_N)"
-
-#: src/gtkprefs.c:1033
-msgid "_Raise IM window on events"
-msgstr "當事件發生時,將視窗提到最上方(_R)"
-
-#: src/gtkprefs.c:1036
-msgid "Raise chat _window on events"
-msgstr "當事件發生時,將交談視窗提到最上方(_R)"
-
-#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "在聊天室內以不同顏色區別不同的暱稱(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "標籤選項"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "在標籤上顯示關閉鍵(_C)"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "標籤位置(_L):"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "視窗右側"
 
 # NOTE 不直接翻譯,改依功能呈現的方式翻譯譯文
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "新交談開啟於(_P):"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4848
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "啟始通訊埠(_S):"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "啟始通訊埠(_S):"
+msgid "_End Port:"
+msgstr "結束通訊埠(_E):"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "結束通訊埠(_E):"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "GNOME預設值"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4099,83 +4106,83 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1641
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1643
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1647
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1648
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1650
 msgid "Console beep"
 msgstr "嗶一聲"
 
+#: src/gtkprefs.c:1652
+msgid "Automatic"
+msgstr "自動"
+
 #: src/gtkprefs.c:1659
-msgid "Automatic"
-msgstr "自動"
-
-#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4184,87 +4191,91 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1803
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "自動回應"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "送出自動回應(_S)"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "只在閒置的時候送出自動回應(_O)"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "何時送出自動回應:"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "從不"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "只在離開期間"
+
+#: src/gtkprefs.c:1810
+msgid "Only when away and idle"
+msgstr "只在同時離開及閒置期間"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4279,7 +4290,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4294,65 +4305,65 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "網路"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4376,63 +4387,63 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "許可"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
@@ -4461,19 +4472,19 @@
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "開啟檔案..."
 
@@ -4483,7 +4494,7 @@
 
 #  list button
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
@@ -4553,7 +4564,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4562,7 +4573,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4572,55 +4583,59 @@
 "</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>無法讀取檔案:%s</b></font>"
 
-#: src/log.c:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "請建立一個帳號。"
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "登入"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>帳號(_A):</b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>密碼(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "登入(_S)"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4654,11 +4669,24 @@
 "  -h, --help          顯示這個說明訊息並離開\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "無法載入偏好設定"
+
+#: src/main.c:845
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim 無法載入您的偏好設定,因為您原有的偏好設定檔格式太舊。請透過「偏好設定」"
+"視窗重新設定您的偏好。"
+
 #: src/plugin.c:286
 #, c-format
 msgid ""
@@ -4683,10 +4711,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
+#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "上線"
 
@@ -4699,11 +4727,11 @@
 msgstr "離開(只有好友可以看到我)"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
 #: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4747,17 +4775,17 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "好友資訊"
 
@@ -4777,10 +4805,10 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 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:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "無法連結。"
 
@@ -4844,26 +4872,26 @@
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4840
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4851 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4841
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "暱稱"
 
@@ -4878,7 +4906,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:4903
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
@@ -4980,7 +5008,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "修改密碼"
 
@@ -5032,15 +5060,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:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6129
 msgid "Authorize"
 msgstr "給予認證"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6130
 msgid "Deny"
 msgstr "拒絕"
 
@@ -5065,13 +5093,13 @@
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "沒有設定主題"
@@ -5104,52 +5132,52 @@
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: src/protocols/irc/irc.c:147
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "主題"
 
@@ -5162,54 +5190,60 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "使用者"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "被禁止"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b>%s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
@@ -5218,140 +5252,147 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b>%s<br>"
+
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "姓名"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "所在頻道"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>閒置了:</b>%s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "上線自"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>描述:</b>光宗耀祖<br>"
 
 # XXX 還是譯成「好友 %s 的資訊」比較通順?
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s 的好友資訊"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -5447,7 +5488,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
@@ -5471,7 +5512,9 @@
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [頻道] [訊息]:離開目前的頻道,或者指定的頻道,並送出指定的訊息。"
+msgstr ""
+"part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
+"息。"
 
 #: src/protocols/irc/parse.c:126
 msgid ""
@@ -5534,26 +5577,26 @@
 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:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: src/protocols/irc/parse.c:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5588,12 +5631,12 @@
 msgstr "伺服器送來了無效的驗證挑戰"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
 msgstr "全名"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "姓"
 
@@ -5603,8 +5646,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "暱稱"
@@ -5668,7 +5711,7 @@
 msgstr "職責"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4876
 msgid "Birthday"
 msgstr "生日"
 
@@ -5688,10 +5731,10 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
+#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "狀態"
 
@@ -5700,19 +5743,19 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "英文別名"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:4902
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "地址"
 
@@ -5800,57 +5843,57 @@
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "聊天室清單錯誤"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
@@ -5925,13 +5968,13 @@
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:4904 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "電話"
@@ -5954,9 +5997,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "連線中"
 
@@ -5974,7 +6017,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6502
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -6017,19 +6060,19 @@
 msgstr "錯誤"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "想聊天"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "長時間離開"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6695
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -6057,7 +6100,7 @@
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
@@ -6206,7 +6249,7 @@
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
@@ -6324,11 +6367,11 @@
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
@@ -6337,40 +6380,40 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt使用者&gt; [聊天室]:邀請某使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 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:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "隱藏作業系統"
 
@@ -6385,26 +6428,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6423,16 +6466,16 @@
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
@@ -6441,39 +6484,39 @@
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "使用者 %s 想要將您加入他(她)的好友清單中。"
 
-#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "設定聊天室"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "使用預設值"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -6492,11 +6535,11 @@
 msgid "Miscellaneous error"
 msgstr "雜類錯誤"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
@@ -6545,7 +6588,7 @@
 msgid "Not on list"
 msgstr "不在清單中"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "使用者是離線的"
 
@@ -6694,8 +6737,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6784,40 +6827,49 @@
 msgid "Page"
 msgstr "傳呼"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b>%s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "馬上回來"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "忙碌"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "電話中"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "隱藏"
 
@@ -6867,7 +6919,7 @@
 "gaim.sf.net/faq-ssl.php。"
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>別名:</b>%s<br>"
@@ -6884,15 +6936,9 @@
 msgid "<font sml=\"msn\">%s</font><br>"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b>%s<br>"
-
 #: src/protocols/msn/msn.c:1242
-#, fuzzy
 msgid "MSN Profile"
-msgstr "設定個人資料"
+msgstr "MSN 個人資料"
 
 #: src/protocols/msn/msn.c:1247 src/protocols/msn/msn.c:1499
 #: src/protocols/yahoo/yahoo_profile.c:761
@@ -6900,14 +6946,14 @@
 msgstr "取得個人資訊時發生錯誤"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4881
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4867
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6952,7 +6998,7 @@
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
@@ -6982,11 +7028,11 @@
 msgid "Profile URL"
 msgstr "個人資料網址"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "顯示「交談視窗已關閉」的通知"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "顯示「交談已逾時」的通知"
 
@@ -7001,15 +7047,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -7030,7 +7076,7 @@
 msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "密碼送出"
 
@@ -7157,8 +7203,8 @@
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6200
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -7400,12 +7446,6 @@
 msgid "Userid"
 msgstr "使用者 ID"
 
-#  tag = _("DN");
-#  value = nm_user_record_get_dn(user_record);
-#  if (value) {
-#  g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n
-#  tag, value);
-#  }
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
@@ -7471,11 +7511,11 @@
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1936
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:1990
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7485,35 +7525,35 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2088
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2110
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2419
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6504 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2742
 msgid "Message"
 msgstr "訊息"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
 msgid "Appear Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
@@ -7528,15 +7568,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: 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:3410
+#: src/protocols/novell/novell.c:3408
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3412
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
@@ -7641,7 +7681,7 @@
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7649,45 +7689,45 @@
 "(為這個訊息轉換編碼時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的客"
 "戶端程式。)"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6806
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -7698,144 +7738,144 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:484
+#: src/protocols/oscar/oscar.c:468
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:471
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:474
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:477
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:496
+#: src/protocols/oscar/oscar.c:480
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:500
+#: src/protocols/oscar/oscar.c:484
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:503
+#: src/protocols/oscar/oscar.c:487
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:506
+#: src/protocols/oscar/oscar.c:490
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6698
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6696
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6697
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "直接連線失敗"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "和 %s 的即時訊息已經被建立"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "無法開啟直接的即時訊息"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
 
-#: src/protocols/oscar/oscar.c:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
 
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "連線"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7845,48 +7885,48 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7894,21 +7934,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7917,24 +7957,24 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2274
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7943,42 +7983,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, 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:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6121 src/protocols/oscar/oscar.c:6167
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7987,11 +8027,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6127
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8001,17 +8041,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8024,7 +8064,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8037,7 +8077,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8050,34 +8090,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3615
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3712
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8087,83 +8127,92 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3730
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3749
+#: src/protocols/oscar/oscar.c:3739
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:3758
+#: src/protocols/oscar/oscar.c:3748
 #, 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:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
-msgstr "%s 的 ICQ 資訊"
-
-#: src/protocols/oscar/oscar.c:3881
+msgstr "%s 的資訊"
+
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "未知錯誤"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+# NOTE 譯文更動 by Ambrose
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "無法送出您的訊息。"
+
+#: src/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "無法取得個人資訊:%s"
+
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4486
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4487
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8171,113 +8220,113 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4550
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4552
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:4583
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4854 src/protocols/oscar/oscar.c:4861
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4866 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4867
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4884
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4888
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4893
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4901
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4909
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:4910
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4918
+#: src/protocols/oscar/oscar.c:4911
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4919
+#: src/protocols/oscar/oscar.c:4912
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:4914
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4924
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4973
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4994
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:4998
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5036
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5038
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
@@ -8385,7 +8434,7 @@
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6703
 msgid "Visible"
 msgstr "現身"
 
@@ -8428,16 +8477,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5538 src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:6001
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5699
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5700
 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 "
@@ -8446,13 +8495,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5882 src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:5888 src/protocols/oscar/oscar.c:6045
+#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6051
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8461,11 +8510,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5985 src/protocols/oscar/oscar.c:5999
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5999
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8475,7 +8524,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:6079
+#: src/protocols/oscar/oscar.c:6082
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8485,11 +8534,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6088
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6121
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8499,18 +8548,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6163
 #, 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:6161
+#: src/protocols/oscar/oscar.c:6164
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6167
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8520,74 +8569,79 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6168
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6205 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6227
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6317
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6475
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6762
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s 的好友說明"
+
+#: src/protocols/oscar/oscar.c:6763
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6782
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6788
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6800
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6817
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6847
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6848
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6855
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6907
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6952
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6955
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6956
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8595,76 +8649,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6973
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6974
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6975
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6989
+#: src/protocols/oscar/oscar.c:6992
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6993
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7075 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7080
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7086
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7091 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7096
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7100
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7109
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7113
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7117
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7121
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7128
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7134
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7139
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8679,15 +8733,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7257 src/protocols/oscar/oscar.c:7259
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7278
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7283
 msgid "Auth port"
 msgstr "認證通訊埠"
 
@@ -8774,12 +8828,12 @@
 msgstr "設定即時訊息密碼"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
@@ -8792,14 +8846,14 @@
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
@@ -8937,36 +8991,36 @@
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "所用裝置"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "時區"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "所在位置"
 
@@ -8986,7 +9040,7 @@
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
@@ -9096,7 +9150,7 @@
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "密碼"
 
@@ -9173,35 +9227,35 @@
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, 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:1046
+#: src/protocols/silc/chat.c:1039
 #, 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:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -9258,145 +9312,145 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, 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:417
+#: src/protocols/silc/ops.c:418
 #, 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:448
+#: src/protocols/silc/ops.c:451
 #, 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:452
+#: src/protocols/silc/ops.c:459
 #, 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:479
+#: src/protocols/silc/ops.c:488
 #, 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:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "職銜"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "職責"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "所屬機構"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "部門"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "電子郵件"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "備註"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: src/protocols/silc/ops.c:1315
+#: src/protocols/silc/ops.c:1324
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: src/protocols/silc/ops.c:1324
-msgid "No server statisitics available"
+#: src/protocols/silc/ops.c:1333
+msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9431,99 +9485,99 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1377
+#: src/protocols/silc/ops.c:1386
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1391
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: src/protocols/silc/ops.c:1390
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1699
+#: src/protocols/silc/ops.c:1708
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的客戶端程式"
 
-#: src/protocols/silc/ops.c:1702
+#: src/protocols/silc/ops.c:1711
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: src/protocols/silc/ops.c:1705
+#: src/protocols/silc/ops.c:1714
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1708
+#: src/protocols/silc/ops.c:1717
 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:1711
+#: src/protocols/silc/ops.c:1720
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: src/protocols/silc/ops.c:1714
+#: src/protocols/silc/ops.c:1723
 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:1717
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -9736,7 +9790,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
@@ -9760,25 +9814,25 @@
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的客戶端指令"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1361
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1364
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+#: src/protocols/silc/silc.c:1365
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt]; [參數]:設定顯示頻道模式"
-
-#: src/protocols/silc/silc.c:1368
+msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
+
+#: src/protocols/silc/silc.c:1369
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9786,15 +9840,15 @@
 "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的"
 "模式"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9802,37 +9856,37 @@
 "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的"
 "被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的客戶端"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得客戶端或伺服器的公鑰"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9840,39 +9894,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
 "多個頻道的使用者或某一類使用者"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9886,43 +9940,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
@@ -10151,15 +10205,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 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 "
@@ -10168,44 +10222,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -10221,15 +10275,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -10327,9 +10381,10 @@
 "device."
 msgstr "您已經被登出,因為您已在另一處登入。"
 
+# NOTE 譯文更動 by Ambrose
 #: src/protocols/yahoo/yahoo.c:808
 msgid "Your Yahoo! message did not get sent."
-msgstr "您的 Yahoo! 訊息並沒有被送出。"
+msgstr "無法送出您的 Yahoo! 訊息。"
 
 #: src/protocols/yahoo/yahoo.c:827
 msgid "Buzz!!"
@@ -10424,42 +10479,44 @@
 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:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -10467,45 +10524,36 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b>%s"
-
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
@@ -10520,47 +10568,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr "傳呼系統伺服器(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr "檔案傳輸主機(日本地區)"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
 msgstr "YCHT 主機"
 
-#: src/protocols/yahoo/yahoo.c:3340
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
 msgstr "YCHT 通訊埠"
 
@@ -10659,33 +10707,33 @@
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "或許參與聊天室使用者已經到達上限?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
@@ -10718,39 +10766,33 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "與 YCHT 伺服器出現連線錯誤"
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "無法傳送至聊天室 %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>使用者:</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>隱藏或未登入"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>從 %2$s 起已在 %1$s"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "任何人"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "已經登入 Zephyr"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
-
 # XXX 暫譯
 # NOTE 之前的搜尋結果(下列第一個鏈結)是說 Class 不是類別,
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
@@ -10758,61 +10800,61 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 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:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "加人聊天室(交談) %s,%s,%s 失敗"
 
-#: src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&rdquo;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:1699
+#: src/protocols/zephyr/zephyr.c:1702
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;實體&gt;:送出訊息至&lt;訊息,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1710
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1716
+#: src/protocols/zephyr/zephyr.c:1719
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10820,7 +10862,7 @@
 "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
 "實體</i>,<i>接受者</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1722
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10828,18 +10870,18 @@
 "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
 "</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: src/protocols/zephyr/zephyr.c:1802
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -10854,7 +10896,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -10864,18 +10906,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:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 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:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -10903,7 +10945,7 @@
 "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "使用者自定"
 
@@ -10918,63 +10960,63 @@
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10983,11 +11025,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10996,12 +11038,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -11076,6 +11118,32 @@
 msgid "Notification"
 msgstr "通知"
 
+#~ msgid "Already logged in with Zephyr"
+#~ msgstr "已經登入 Zephyr"
+
+#~ msgid ""
+#~ "Because Zephyr uses your system username, you are unable to have multiple "
+#~ "accounts on it when logged in as the same user."
+#~ msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
+
+#~ msgid "sorry, i ran out for a while. bbl"
+#~ msgstr "不好意思,我離開一下下。"
+
+#~ msgid "boring default"
+#~ msgstr "無聊(預設)"
+
+#~ msgid "help:  List available commands."
+#~ msgstr "help:列出可用的指令。"
+
+#~ msgid "_Ignore formatting on incoming messages"
+#~ msgstr "忽略所收訊息的格式化(_I)"
+
+#~ msgid "_Send auto-response"
+#~ msgstr "送出自動回應(_S)"
+
+#~ msgid "_Only send auto-response when idle"
+#~ msgstr "只在閒置的時候送出自動回應(_O)"
+
 #~ msgid "Invalid file name."
 #~ msgstr "檔案名稱無效。"
 
@@ -11386,9 +11454,6 @@
 #~ msgid "<b>Screen Name:</b>"
 #~ msgstr "<b>帳號:</b>"
 
-#~ msgid "Sign on"
-#~ msgstr "登入"
-
 #~ msgid "AIM Screen name"
 #~ msgstr "AIM 帳號"