diff po/zh_TW.po @ 9069:0c69f5182652

[gaim-migrate @ 9845] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 26 May 2004 03:28:36 +0000
parents c9c54c17a9dd
children c16b81557679
line wrap: on
line diff
--- a/po/zh_TW.po	Wed May 26 03:20:33 2004 +0000
+++ b/po/zh_TW.po	Wed May 26 03:28:36 2004 +0000
@@ -41,7 +41,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.78\n"
-"POT-Creation-Date: 2004-05-17 16:06-0400\n"
+"POT-Creation-Date: 2004-05-25 03:43-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"
@@ -213,21 +213,21 @@
 msgid "New..."
 msgstr "新增..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1568 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2715
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2884
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:5815 src/protocols/oscar/oscar.c:6431
-#: src/protocols/silc/buddy.c:1360 src/protocols/silc/silc.c:46
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
+#: src/protocols/silc/buddy.c:1398 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:4751 src/protocols/oscar/oscar.c:6439
+#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
 msgid "Back"
 msgstr "返回"
 
@@ -235,7 +235,7 @@
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
@@ -243,7 +243,7 @@
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2520
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -464,16 +464,16 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2996 src/gtkprefs.c:862 src/gtkprefs.c:976
-#: src/gtkprefs.c:1018 src/gtkprefs.c:1581 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
+#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "無"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1928
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
 #: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1365 src/protocols/trepia/trepia.c:398
+#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "名稱"
 
@@ -491,13 +491,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6704
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
 msgid "Search"
 msgstr "搜尋"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
-#: src/gtkblist.c:4339
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "群組:"
 
@@ -540,19 +540,19 @@
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3836
+#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "好友"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
@@ -560,11 +560,11 @@
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "帳號"
 
@@ -575,7 +575,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -585,7 +585,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
 msgid "Provides integration with Ximian Evolution."
 msgstr "提供和 Ximian Evolution 的整合。"
 
@@ -613,7 +613,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
@@ -661,31 +661,29 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
 
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "閒置時間"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "設定帳號"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "閒置時間"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "分鐘。"
-
-#: plugins/idle.c:96
+#  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
+#  FIXME 譯文有待改進
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "分鐘數"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "自定個別賬號的閒置時間"
+
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:793
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "允許您手動進入閒置狀態,並設定閒置多久時間"
 
@@ -946,14 +944,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "信號測試"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -1101,11 +1099,11 @@
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
@@ -1135,6 +1133,10 @@
 msgid "Delay"
 msgstr "延遲"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "分鐘。"
+
 #: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "套用(_A)"
@@ -1177,7 +1179,7 @@
 msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:856
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "好友清單視窗"
 
@@ -1229,8 +1231,8 @@
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3037
-#: src/gtkprefs.c:2427
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "好友清單"
 
@@ -1249,8 +1251,8 @@
 msgstr "將好友清單視窗保持在桌面的最上層(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:897
-#: src/gtkprefs.c:2428 src/protocols/msn/msn.c:1607
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
 msgstr "交談"
 
@@ -1266,16 +1268,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/about.c:74
+#: src/about.c:75
 #, 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:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1286,126 +1288,126 @@
 "方式發佈。<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/about.c:104
+#: 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:109
+#: src/about.c:110
 msgid "Active Developers"
 msgstr "現任開發者"
 
-#: src/about.c:110
+#: src/about.c:111
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "主要開發者"
 
-#: src/about.c:115
+#: src/about.c:116
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "開發者"
 
-#: src/about.c:122
+#: 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:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "前 libfaim 維護者"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "前主要開發者"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "前維護者"
 
-#: src/about.c:151
-msgid "former Jabber developer"
-msgstr "前 Jabber 開發者"
-
 #: src/about.c:152
+msgid "former Jabber developer"
+msgstr "前 Jabber 開發者"
+
+#: src/about.c:153
 msgid "original author"
 msgstr "原作者"
 
-#: src/about.c:155
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/about.c:163
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "現任譯者"
 
 # NOTE 寫出來的是「文」,不是「語」;下同 :-)
-#: src/about.c:164 src/about.c:201
+#: src/about.c:165 src/about.c:202
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/about.c:165 src/about.c:202
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "British English"
 msgstr "英式英文"
 
-#: src/about.c:168
+#: src/about.c:169
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/about.c:169 src/about.c:203
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "德文"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/about.c:171 src/about.c:205
+#: src/about.c:172 src/about.c:206
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/about.c:172 src/about.c:206
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "法文"
 
-#: src/about.c:173
+#: src/about.c:174
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -1413,50 +1415,50 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/about.c:176 src/about.c:207
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/about.c:177 src/about.c:209
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "韓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/about.c:178
+#: src/about.c:179
 msgid "Dutch; Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/about.c:179
+#: src/about.c:180
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/about.c:181 src/about.c:210
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/about.c:185 src/about.c:211
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "俄文"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
@@ -1464,52 +1466,52 @@
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/about.c:187
+#: src/about.c:188
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/about.c:188 src/about.c:213
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Gnome 越南文翻譯小組"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/about.c:191
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: src/about.c:198
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "前任譯者"
 
 # XXX Yahoo譯法
-#: src/about.c:199
+#: src/about.c:200
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/about.c:200
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Japanese"
 msgstr "日文"
 
-#: src/about.c:212
+#: src/about.c:213
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#: src/about.c:214
+#: src/about.c:215
 msgid "Chinese"
 msgstr "中文"
 
@@ -1546,45 +1548,45 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
-#: src/dialogs.c:581 src/gtkblist.c:2391 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:191 src/protocols/msn/msn.c:202
-#: src/protocols/msn/msn.c:213 src/protocols/msn/msn.c:224
-#: src/protocols/oscar/oscar.c:2759 src/protocols/oscar/oscar.c:2840
-#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6588
-#: src/protocols/oscar/oscar.c:6637 src/protocols/oscar/oscar.c:6721
-#: src/protocols/silc/buddy.c:447 src/protocols/silc/buddy.c:1087
-#: src/protocols/silc/chat.c:657 src/protocols/silc/ops.c:978
-#: src/protocols/silc/ops.c:1389 src/protocols/silc/silc.c:687
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2512
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
+#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
+#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
+#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
+#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
+#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
 #: src/request.h:1242
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
-#: src/dialogs.c:306 src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352
-#: src/dialogs.c:473 src/dialogs.c:529 src/dialogs.c:582 src/dialogs.c:907
-#: src/dialogs.c:929 src/dialogs.c:946 src/dialogs.c:965 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2392 src/gtkblist.c:4378
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:588
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
+#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
+#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
 #: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6493
-#: src/protocols/oscar/oscar.c:6589 src/protocols/oscar/oscar.c:6638
-#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6722
-#: src/protocols/silc/buddy.c:448 src/protocols/silc/buddy.c:992
-#: src/protocols/silc/buddy.c:1088 src/protocols/silc/chat.c:658
-#: src/protocols/silc/ops.c:1390 src/protocols/silc/silc.c:688
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2513 src/request.h:1242 src/request.h:1252
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
+#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
+#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
+#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "取消"
 
@@ -1593,8 +1595,8 @@
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:381 src/dialogs.c:895 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "儲存"
 
@@ -1616,7 +1618,7 @@
 msgstr "移除離開訊息"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1145 src/gtkconv.c:3329 src/gtkconv.c:3428
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "移除"
@@ -1629,7 +1631,7 @@
 msgid "Set All Away"
 msgstr "全部設為離開"
 
-#: src/blist.c:590 src/gtkprefs.c:2430
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "聊天"
 
@@ -1652,8 +1654,8 @@
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:732
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2727
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "未知"
 
@@ -1672,20 +1674,20 @@
 msgid "Buddy List Error"
 msgstr "好友清單錯誤"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "輸入 %s 的密碼"
@@ -1703,7 +1705,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1954
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1713,62 +1715,66 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1957
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:2049
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:2052
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:2097
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s 離開聊天室。"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(以及另外 %d 個)"
 
-#: src/conversation.c:2172
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " 離開聊天室 (%s)。"
 
-#: src/conversation.c:2452
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/conversation.c:2454 src/gtkprefs.c:1356
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "新視窗"
 
-#: src/conversation.c:2456
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "依群組"
 
-#: src/conversation.c:2458
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "依帳號"
 
-#: src/dialogs.c:155
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "依交談個數"
+
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "警告使用者"
 
-#: src/dialogs.c:174
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1780,37 +1786,37 @@
 "\n"
 "這個動作將會增加 %s 的警告等級,同時他 / 她將被限制以更嚴格的速率限制。\n"
 
-#: src/dialogs.c:183
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "以匿名的身份發出警告?(_A)"
 
-#: src/dialogs.c:190
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>匿名的警告比較上沒有那麼嚴重。</b>"
 
-#: src/dialogs.c:302
+#: src/dialogs.c:301
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:304 src/dialogs.c:305
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "移除好友"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:313
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "您正試著將 %s 從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1818,11 +1824,11 @@
 msgstr ""
 "您正試著將群組 %s 及相關的成員從您的好友清單中移除。您要繼續這個動作嗎?"
 
-#: src/dialogs.c:329 src/dialogs.c:330
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:346
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1832,115 +1838,107 @@
 "作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/dialogs.c:350 src/dialogs.c:351
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "移除好友"
 
-#: src/dialogs.c:454 src/dialogs.c:510 src/dialogs.c:562
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "帳號(_S)"
 
-#: src/dialogs.c:460 src/dialogs.c:516 src/dialogs.c:568
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:466
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:468
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/dialogs.c:523
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:524
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/dialogs.c:576
+#: src/dialogs.c:575
 msgid "Get User Log"
 msgstr "讀取使用者日誌"
 
-#: src/dialogs.c:578
+#: src/dialogs.c:577
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
-#: src/dialogs.c:606 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "設定文字顏色"
-
-#: src/dialogs.c:634 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "設定背景顏色"
-
-#: src/dialogs.c:673 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "選擇字型"
-
-#: src/dialogs.c:746
+#: src/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "您不能儲存一個沒有原因的離開訊息"
 
-#: src/dialogs.c:748
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "請給予訊息一個標題;或按「使用」來使用,同時不儲存它。"
 
-#: src/dialogs.c:758
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "您無法建立一個空白的離開訊息"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "新的離開訊息"
 
-#: src/dialogs.c:841
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "離開原因:"
 
-#: src/dialogs.c:899
-msgid "Save & Use"
-msgstr "儲存並使用"
-
-#: src/dialogs.c:903
-msgid "Use"
-msgstr "使用"
-
-#: src/dialogs.c:925
+#: src/dialogs.c:781
+msgid "_Save"
+msgstr "儲存(_S)"
+
+#: src/dialogs.c:785
+msgid "Sa_ve & Use"
+msgstr "儲存並使用(_V)"
+
+#: src/dialogs.c:789
+msgid "_Use"
+msgstr "使用(_U)"
+
+#: src/dialogs.c:811
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/dialogs.c:926
+#: src/dialogs.c:812
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/dialogs.c:928 src/dialogs.c:945 src/dialogs.c:964 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:545
+#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:942
+#: src/dialogs.c:828
 msgid "Alias Contact"
 msgstr "給好友改別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/dialogs.c:943
+#: src/dialogs.c:829
 msgid "Enter an alias for this contact."
 msgstr "請為這個好友輸入一個別名。"
 
-#: src/dialogs.c:960
+#: src/dialogs.c:846
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "為好友加上別名"
 
@@ -2051,19 +2049,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "不好意思,我離開一下下。"
 
-#: src/gaimrc.c:374 src/gaimrc.c:1405
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "無聊(預設)"
 
-#: src/gaimrc.c:1215 src/gtkblist.c:2998
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "依照字母"
 
-#: src/gaimrc.c:1217 src/gtkblist.c:2999
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:3000
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "依照日誌大小"
 
@@ -2087,7 +2085,7 @@
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3983
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
 msgstr "帳號:"
 
@@ -2095,7 +2093,7 @@
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3997 src/gtkblist.c:4325
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "別名:"
 
@@ -2158,7 +2156,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1157
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -2174,15 +2172,15 @@
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1151
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1181
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1199
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
@@ -2190,7 +2188,7 @@
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1236
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
@@ -2226,15 +2224,15 @@
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3364
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
 msgid "Screen Name"
 msgstr "帳號"
 
 #: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4831
-#: src/protocols/oscar/oscar.c:6430 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2299 src/protocols/zephyr/zephyr.c:1183
-#: src/protocols/zephyr/zephyr.c:1193
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "上線"
 
@@ -2266,214 +2264,218 @@
 msgstr "將使用者加入您的好友清單?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4377 src/gtkconv.c:1147
-#: src/gtkconv.c:3322 src/gtkconv.c:3421 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3003
+#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
+#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:811
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:832
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:843 src/gtkpounce.c:431 src/gtkroomlist.c:352
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1082 src/gtkblist.c:3187
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1085 src/gtkblist.c:3178
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1087
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1089
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1154 src/gtkblist.c:1283 src/gtkblist.c:1297
+#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1156 src/gtkblist.c:1285 src/gtkblist.c:1302
+#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1261 src/gtkroomlist.c:261 src/gtkroomlist.c:404
+#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1263
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1299 src/gtkblist.c:1325
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1330
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "展開(_E)"
 
 # XXX 暫譯
-#: src/gtkblist.c:1988 src/gtkconv.c:3942 src/gtkpounce.c:333
+#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2296
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/好友/登出(_S)"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/工具/離開(_A)"
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2311
 msgid "/Tools/Account Ac_tions"
 msgstr "/工具/帳號相關指令(_T)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2312
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/工具/模組相關指令(_U)"
+
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/工具/帳號清單(_C)"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "觀看系統日誌(_L)"
 
 #. Help
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "修改群組名稱"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "新名字"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "請為選取的群組輸入一個新的名稱。"
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2482,7 +2484,7 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2435
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2490,12 +2492,12 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2503,7 +2505,7 @@
 "\n"
 "<b>帳號:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2511,7 +2513,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2519,7 +2521,7 @@
 "\n"
 "<b>別名:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2527,7 +2529,7 @@
 "\n"
 "<b>暱稱:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2535,7 +2537,7 @@
 "\n"
 "<b>登入時間:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2543,7 +2545,7 @@
 "\n"
 "<b>閒置:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2551,7 +2553,7 @@
 "\n"
 "<b>警告:<b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2559,7 +2561,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2567,7 +2569,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2575,92 +2577,96 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2793
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "閒置(%d 小時 %02d 分)"
 
-#: src/gtkblist.c:2795
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "閒置(%d 分)"
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "警告 (%d%%)"
 
-#: src/gtkblist.c:2803
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "離線"
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2875
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2878
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:2927
+#: src/gtkblist.c:2881
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3064
+#: src/gtkblist.c:3026
 msgid "/Tools/Away"
 msgstr "/工具/離開"
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:3029
 msgid "/Tools/Buddy Pounce"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3070
+#: src/gtkblist.c:3032
 msgid "/Tools/Account Actions"
 msgstr "/工具/帳號相關指令"
 
+#: src/gtkblist.c:3035
+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:3158
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3160
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3184
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "傳送訊息給被選取的好友"
 
-#: src/gtkblist.c:3193
+#: src/gtkblist.c:3158
 msgid "Get information on the selected buddy"
 msgstr "取得被選取好友的資訊"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3161
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: src/gtkblist.c:3201
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "加入一個聊天室"
 
-#: src/gtkblist.c:3204
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "離開(_A)"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "設定一個離開訊息"
 
-#: src/gtkblist.c:3938 src/protocols/silc/buddy.c:686
-#: src/protocols/silc/buddy.c:944 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/buddy.c:1079 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
+#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
+#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
 msgid "Add Buddy"
 msgstr "新增好友"
 
-#: src/gtkblist.c:3961
+#: src/gtkblist.c:3933
 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. "
@@ -2670,37 +2676,39 @@
 "在好友清單中顯示。\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4021 src/gtkblist.c:4305
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4265
+#: src/gtkblist.c:4237
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4272
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4268
 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:4374
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4375
+#: src/gtkblist.c:4348
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:4919
+#  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
+#  NOTE 譯成「不允許」會非常怪
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
-msgstr "不允許任何動作"
+msgstr "沒有相關指令"
 
 #: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
@@ -2757,310 +2765,314 @@
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkconv.c:539
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:567
+#: src/gtkconv.c:582
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:588
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:608
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:701 src/gtkdebug.c:127
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:727 src/gtkdebug.c:155
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1105
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkconv.c:1113
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#: src/gtkconv.c:1115
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "忽略使用者"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
 #. Info button
-#: src/gtkconv.c:1124 src/gtkconv.c:3336
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1133
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "取得離線訊息"
 
-#: src/gtkconv.c:2233
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2238
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#: src/gtkconv.c:2244
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "儲存圖示為..."
 
-#: src/gtkconv.c:2611
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2619
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "使用者輸入了些東西,不過目前暫停輸入"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2722
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "使用帳號(_S)"
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
 #. Conversation menu
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:3118
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:3125
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:3131
+#: src/gtkconv.c:3152
+msgid "/Conversation/Clear"
+msgstr "/交談/清空"
+
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/交談/警告(_W)..."
 
-#: src/gtkconv.c:3137
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/交談/別名(_L)..."
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:3146
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:3148
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:3153
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:3155
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:3164
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:3166
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:3209
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/交談/警告..."
 
-#: src/gtkconv.c:3228
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:3238
+#: src/gtkconv.c:3263
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:3242
+#: src/gtkconv.c:3267
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:3246
+#: src/gtkconv.c:3271
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:3252
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:3256
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:3262
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:3265
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:3268
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/選項/顯示格式工具列"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3292 src/gtkconv.c:3294 src/gtkconv.c:3400 src/gtkconv.c:3402
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "送出"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3308
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "警告"
 
-#: src/gtkconv.c:3311
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "警告使用者"
 
 #. Block button
-#: src/gtkconv.c:3315 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "封鎖"
 
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "封鎖使用者"
 
-#: src/gtkconv.c:3325
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "將使用者加入您的好友清單"
 
-#: src/gtkconv.c:3332
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "將使用者自您的好友清單中移除"
 
-#: src/gtkconv.c:3339 src/gtkconv.c:3683
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
 #. Invite
-#: src/gtkconv.c:3414
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "邀請"
 
-#: src/gtkconv.c:3417
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "邀請使用者"
 
-#: src/gtkconv.c:3424
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "將這個聊天室加入您的好友清單"
 
-#: src/gtkconv.c:3431
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "將這個聊天室自您的好友清單中移除"
 
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:4233
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:4756 src/gtkconv.c:4788 src/gtkconv.c:4909 src/gtkconv.c:4976
+#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5507 src/gtkconv.c:5510
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/交談/關閉"
 
@@ -3081,138 +3093,143 @@
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "完了"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "已取消"
+
+#  XXX 暫譯
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "等待開始傳輸檔案中..."
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr "沒有設定任何應用程式可以開啟這類檔案。"
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "開啟檔案途中發生錯誤。"
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "檔名:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "狀態:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "保持對話框開啟(_K)"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "顯示傳輸細節"
 
 # XXX 暫譯
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "隱藏傳輸細節"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "已取消"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "失敗"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "檔案不存在。"
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
 msgstr "那個檔案已經存在。"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1131 src/protocols/silc/buddy.c:978
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
 msgid "Open..."
 msgstr "開啟..."
 
 # XXX 要覆查
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3228,120 +3245,144 @@
 msgid "Pa_ste As Text"
 msgstr "貼上純文字(_S)"
 
-#: src/gtkimhtml.c:1200
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "連結顏色"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "顯示連結時所用的顏色。"
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:1212
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: src/gtkimhtml.c:1222
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:2651
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim 無法依照副檔名來判別影像格式,暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:2659
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "儲存影像錯誤:%s"
 
-#: src/gtkimhtml.c:2668
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:2691
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "選擇字型"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "設定文字顏色"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "設定背景顏色"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "加入連結"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "請輸入您所要插入的 URL。"
+
+#: src/gtkimhtmltoolbar.c:409
+msgid "Insert Link"
+msgstr "加入連結"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:457
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:483
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:618
+#: src/gtkimhtmltoolbar.c:638
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:633
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:851
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:862
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:873
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:889
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:901
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:918
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:930
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:942
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "背景顏色"
 
-#: src/gtkimhtmltoolbar.c:957
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:978
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
 msgstr "插入表情"
 
@@ -3351,7 +3392,7 @@
 msgstr "交談:"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "系統日誌"
 
@@ -3395,22 +3436,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
-#: src/gtknotify.c:559
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:433 src/gtknotify.c:448
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "執行「%s」時發生了錯誤:%s"
 
-#: src/gtknotify.c:560
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -3563,15 +3604,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:407
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "介面選項"
 
-#: src/gtkprefs.c:409
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "當別名沒有設定時,以對方所設定的暱稱顯示(_I)"
 
-#: src/gtkprefs.c:633
+#: src/gtkprefs.c:632
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3579,303 +3620,331 @@
 "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題"
 "安裝到清單中。"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:680 src/gtkprefs.c:1965 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:794 src/gtkprefs.c:1026
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "顯示"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "顯示訊息時間(_T)"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "標示出拼錯的字(_H)"
 
-#: src/gtkprefs.c:801
-msgid "Ignore formatting on incoming messages"
-msgstr "忽略所收訊息的格式化"
-
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:784
+msgid "Ignore c_olors"
+msgstr "忽略顏色(_O)"
+
+#: src/gtkprefs.c:786
+msgid "Ignore font _faces"
+msgstr "忽略字體(_F)"
+
+#: src/gtkprefs.c:788
+msgid "Ignore font si_zes"
+msgstr "忽略字體大小(_Z)"
+
+#: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "忽略所收訊息的格式化(_I)"
+
+#: src/gtkprefs.c:795
+msgid "Default Formatting"
+msgstr "預設格式"
+
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "送出訊息時使用預設格式化(_S)"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
+
+#  XXX 暫譯
+#: src/gtkprefs.c:832
+msgid "_Clear Formatting"
+msgstr "清除格式化(_C)"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "送出訊息"
 
-#: src/gtkprefs.c:814
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "按下 Enter 送出訊息(_S)"
 
-#: src/gtkprefs.c:816
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "按下 Ctrl-Enter 送出訊息(_O)"
 
-#: src/gtkprefs.c:819
+#: src/gtkprefs.c:875
 msgid "Window Closing"
 msgstr "視窗關閉"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
 msgstr "按下 Escape 關閉視窗(_E)"
 
-#: src/gtkprefs.c:823
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "插入選項"
 
-#: src/gtkprefs.c:824
+#: src/gtkprefs.c:880
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "按下 Ctrl-{B/I/U} 更改字型樣式(_F)"
 
-#: src/gtkprefs.c:826
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
 msgstr "按下 Ctrl-(數字鍵) 插入表情(_I)"
 
-#: src/gtkprefs.c:842
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
 msgstr "好友清單排序"
 
-#: src/gtkprefs.c:851
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "排序方式(_S):"
 
-#: src/gtkprefs.c:857 src/gtkprefs.c:971 src/gtkprefs.c:1013
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
 msgid "Show _buttons as:"
 msgstr "顯示按鍵為(_B):"
 
-#: src/gtkprefs.c:859 src/gtkprefs.c:973 src/gtkprefs.c:1015
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
 msgid "Pictures"
 msgstr "圖形"
 
-#: src/gtkprefs.c:860 src/gtkprefs.c:974 src/gtkprefs.c:1016
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
 msgid "Text"
 msgstr "文字"
 
-#: src/gtkprefs.c:861 src/gtkprefs.c:975 src/gtkprefs.c:1017
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
 msgid "Pictures and text"
 msgstr "圖形與文字"
 
-#: src/gtkprefs.c:864 src/gtkprefs.c:981 src/gtkprefs.c:1023
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "當事件發生時,將視窗提到最上方(_R)"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "好友顯示"
 
-#: src/gtkprefs.c:868 src/gtkprefs.c:986
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "顯示警告等級(_W)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "顯示閒置時間(_T)"
 
-#: src/gtkprefs.c:874
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "把閒置的好友設為灰色(_D)"
 
 # XXX 暫譯
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "自動展開好友(_A)"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "位置(_P):"
 
-#: src/gtkprefs.c:908
-msgid "Show _formatting toolbar"
-msgstr "顯示格式工具列(_F)"
-
-#: src/gtkprefs.c:911
-msgid "Show a_liases in tabs/titles"
-msgstr "在標題和標籤上顯示別名(_L)"
-
-#: src/gtkprefs.c:914
-msgid "Tab Options"
-msgstr "標籤選項"
-
-#: src/gtkprefs.c:916
-msgid "_Tab Placement:"
-msgstr "標籤位置(_T):"
-
-#: src/gtkprefs.c:918
-msgid "Top"
-msgstr "視窗上方"
-
-#: src/gtkprefs.c:919
-msgid "Bottom"
-msgstr "視窗下方"
-
-#: src/gtkprefs.c:920
-msgid "Left"
-msgstr "視窗左側"
-
-#: src/gtkprefs.c:921
-msgid "Right"
-msgstr "視窗右側"
-
-#: src/gtkprefs.c:927
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
-
-#: src/gtkprefs.c:930
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
-
-#: src/gtkprefs.c:940
-msgid "Show _close button on tabs"
-msgstr "在標籤上顯示關閉鍵(_C)"
-
-#: src/gtkprefs.c:970 src/gtkprefs.c:1012
-msgid "Window"
-msgstr "視窗"
+#  FIXME 譯文有待改進
+#: src/gtkprefs.c:976
+msgid "Number of conversations per window"
+msgstr "視窗顯示之交談個數上限"
 
 #: src/gtkprefs.c:985
-msgid "Buddy Icons"
-msgstr "好友圖示"
+msgid "Show _formatting toolbar"
+msgstr "顯示格式工具列(_F)"
 
 #: src/gtkprefs.c:988
+msgid "Show a_liases in tabs/titles"
+msgstr "在標題和標籤上顯示別名(_L)"
+
+#: src/gtkprefs.c:991
+msgid "Tab Options"
+msgstr "標籤選項"
+
+#: src/gtkprefs.c:993
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
+
+#: src/gtkprefs.c:996
+msgid "Show IMs and chats in _same tabbed window"
+msgstr "使用同一個標籤視窗顯示即時訊息和聊天(_S)"
+
+#: src/gtkprefs.c:1006
+msgid "Show _close button on tabs"
+msgstr "在標籤上顯示關閉鍵(_C)"
+
+#: src/gtkprefs.c:1019
+msgid "_Tab Placement:"
+msgstr "標籤位置(_T):"
+
+#: src/gtkprefs.c:1021
+msgid "Top"
+msgstr "視窗上方"
+
+#: src/gtkprefs.c:1022
+msgid "Bottom"
+msgstr "視窗下方"
+
+#: src/gtkprefs.c:1023
+msgid "Left"
+msgstr "視窗左側"
+
+#: src/gtkprefs.c:1024
+msgid "Right"
+msgstr "視窗右側"
+
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
+msgid "Window"
+msgstr "視窗"
+
+#: src/gtkprefs.c:1073
+msgid "Buddy Icons"
+msgstr "好友圖示"
+
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "啟動好友圖示動畫(_N)"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "輸入通知"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1080
 msgid "Notify buddies that you are _typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_T)"
 
-#: src/gtkprefs.c:1028
-msgid "_Show people joining in window"
-msgstr "在視窗中顯示其他人進入的事件(_S)"
-
-#: src/gtkprefs.c:1030
-msgid "_Show people leaving in window"
-msgstr "在視窗中顯示其他人離開的事件(_S)"
-
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1115
 msgid "Co_lorize screen names"
 msgstr "將帳號以顏色區別(_L)"
 
-#: src/gtkprefs.c:1054 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4219
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4811
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1138
 msgid "_Autodetect IP Address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1147
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1089
+#: src/gtkprefs.c:1171
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1092
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1095
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1102
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1150
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "代理伺服器型態"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1153
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1160
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1277
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1279
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1281
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "GNOME預設值"
 
-#: src/gtkprefs.c:1290
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1345
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1354
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "新標籤"
 
-#: src/gtkprefs.c:1371
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3884,83 +3953,79 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1408
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "訊息日誌"
 
-#: src/gtkprefs.c:1411
+#: src/gtkprefs.c:1493
 msgid "Log _Format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1496
 msgid "_Log all instant messages"
 msgstr "記錄所有即時訊息(_L)"
 
-#: src/gtkprefs.c:1416
+#: src/gtkprefs.c:1498
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1419
+#: src/gtkprefs.c:1501
 msgid "System Logs"
 msgstr "系統日誌"
 
-#: src/gtkprefs.c:1421
+#: src/gtkprefs.c:1503
 msgid "_Enable system log"
 msgstr "使用系統日誌(_E)"
 
-#: src/gtkprefs.c:1424
+#: src/gtkprefs.c:1506
 msgid "Log when buddies _sign on/sign off"
 msgstr "記錄好友的登入/登出(_S)"
 
-#: src/gtkprefs.c:1430
+#: src/gtkprefs.c:1512
 msgid "Log when buddies become _idle/un-idle"
 msgstr "記錄好友的閒置/取消閒置(_I)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "記錄好友離開/回來(_B)"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "記錄您自已登入/閒置/離開等狀態(_O)"
 
-#: src/gtkprefs.c:1449
-msgid "I_ndividual log file for each buddy's signons"
-msgstr "以個別的日誌記錄個別好友的登入(_N)"
-
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3969,62 +4034,62 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1569
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
-#: src/gtkprefs.c:1572
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "自動回應"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "送出自動回應(_S)"
 
-#: src/gtkprefs.c:1575
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "只在閒置的時候送出自動回應(_O)"
 
-#: src/gtkprefs.c:1578 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2721 src/protocols/oscar/oscar.c:3377
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "閒置時間報告(_T):"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Gaim 使用狀況"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "X Window 使用狀況"
 
-#: src/gtkprefs.c:1587
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "Windows 使用狀況"
 
-#: src/gtkprefs.c:1595
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "閒置時自動設為離開(_W)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1600
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "離開訊息(_M):"
 
-#: src/gtkprefs.c:1683
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4039,7 +4104,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkprefs.c:1688
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4054,109 +4119,105 @@
 "<span weight=\"bold\">網站:</span>  %s\n"
 "<span weight=\"bold\">檔名:</span>  %s"
 
-#: src/gtkprefs.c:1921
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "載入"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "簡述"
 
 #  NOTE「細節」很恰當,因為畫面上的都是瑣碎的細節,連基本資料都久奉
-#: src/gtkprefs.c:1983
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "細節"
 
-#: src/gtkprefs.c:2110
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:2217
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:2224
+#: src/gtkprefs.c:2301
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:2243
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:2247
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:2386
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: src/gtkprefs.c:2422
+#: src/gtkprefs.c:2499
 msgid "Interface"
 msgstr "介面"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2500
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:2424
-msgid "Fonts"
-msgstr "字型"
-
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2501
 msgid "Message Text"
 msgstr "訊息文字"
 
-#: src/gtkprefs.c:2426
+#: src/gtkprefs.c:2502
 msgid "Shortcuts"
 msgstr "快捷鍵"
 
-#: src/gtkprefs.c:2429
+#: src/gtkprefs.c:2505
 msgid "IMs"
 msgstr "即時訊息"
 
-#: src/gtkprefs.c:2431
+#: src/gtkprefs.c:2507
 msgid "Network"
 msgstr "網路"
 
-#: src/gtkprefs.c:2432
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "代理伺服器"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2435
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:2437
+#: src/gtkprefs.c:2513
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:2438
+#: src/gtkprefs.c:2514
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2515
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:2440
+#: src/gtkprefs.c:2516
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprefs.c:2441
+#: src/gtkprefs.c:2517
 msgid "Away Messages"
 msgstr "離開訊息"
 
-#: src/gtkprefs.c:2444
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "通訊協定"
 
-#: src/gtkprefs.c:2445
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "模組清單"
 
@@ -4180,7 +4241,7 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1277
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "隱私設定"
 
@@ -4244,14 +4305,14 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1837 src/protocols/silc/buddy.c:303
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "是"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1838 src/protocols/silc/buddy.c:304
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "否"
@@ -4260,7 +4321,7 @@
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
 #: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "關閉"
@@ -4455,18 +4516,18 @@
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim 無法讀入您所提供的模組。"
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
@@ -4477,12 +4538,12 @@
 msgstr "無聊(預設)"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:378 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2712
-#: src/protocols/novell/novell.c:2831 src/protocols/novell/novell.c:2882
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2771
 msgid "Available"
 msgstr "上線"
 
@@ -4495,11 +4556,11 @@
 msgstr "離開(只有好友可以看到我)"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4746 src/protocols/oscar/oscar.c:4824
-#: src/protocols/oscar/oscar.c:4848 src/protocols/oscar/oscar.c:6436
-#: src/protocols/oscar/oscar.c:6441 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
+#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "隱身"
 
@@ -4516,7 +4577,7 @@
 msgid "Unable to resolve hostname."
 msgstr "無法解析主機名稱。"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1659
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
@@ -4543,174 +4604,175 @@
 msgid "Unknown Error Code."
 msgstr "未知的錯誤代碼。"
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "狀態:%s"
 
-#: src/protocols/gg/gg.c:399
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:414
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:593 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:518
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
+#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
+#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
+#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/gg/gg.c:609
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "讀取資料中"
 
-#: src/protocols/gg/gg.c:612
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "和負載平衡器交談中"
 
-#: src/protocols/gg/gg.c:615
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "讀取 Server Key 中"
 
-#: src/protocols/gg/gg.c:618
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "交換密鑰中"
 
-#: src/protocols/gg/gg.c:628
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "在 GG Library 中的重大錯誤\n"
 
-#: src/protocols/gg/gg.c:646 src/protocols/gg/gg.c:737
-#: src/protocols/toc/toc.c:176
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/toc/toc.c:175
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "無法取得伺服器回應"
 
 # XXX
-#: src/protocols/gg/gg.c:706
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "以訊息送出"
 
-#: src/protocols/gg/gg.c:711
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "搜尋 GG 伺服器"
 
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "給予了無效的 Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:769
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "您試圖對無效的 Gadu-Gadu UIN 送出一個訊息。"
 
-#: src/protocols/gg/gg.c:827
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "無法取得搜尋結果"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu 搜尋引擎"
 
 #  XXX 這個有點怪,譯錯?
-#: src/protocols/gg/gg.c:857
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "啟動"
 
-#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4211
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
 msgid "UIN"
 msgstr "帳號"
 
 #. First Name
-#: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4222 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "名"
 
 #. Last Name
-#: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1626
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/gg/gg.c:882 src/protocols/gg/gg.c:885
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:893
-#: src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "性別"
 
 #. City
-#: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4266 src/protocols/oscar/oscar.c:4274
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "城市"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1301
-#: src/protocols/msn/msn.c:1545 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:3405
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:568
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
+#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: src/protocols/gg/gg.c:940
+#: src/protocols/gg/gg.c:950
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 伺服器上並沒有儲存任何的好友清單。"
 
-#: src/protocols/gg/gg.c:948
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "無法自伺服器上取得好友名單"
 
-#: src/protocols/gg/gg.c:1011
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "成功的將好友清單傳送到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:1019
+#: src/protocols/gg/gg.c:1029
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "無法傳送好友清單到 Gadu-Gadu 伺服器上"
 
-#: src/protocols/gg/gg.c:1027
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "成功的將好友清單自 Gadu-Gadu 伺服器上刪除"
 
-#: src/protocols/gg/gg.c:1035
+#: src/protocols/gg/gg.c:1045
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "無法刪除在 Gadu-Gadu 伺服器上的好友清單"
 
-#: src/protocols/gg/gg.c:1044
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "密碼修改成功"
 
-#: src/protocols/gg/gg.c:1051
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "密碼無法修改"
 
-#: src/protocols/gg/gg.c:1170
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "和 Gadu-Gadu 伺服器溝通時發生錯誤"
 
-#: src/protocols/gg/gg.c:1171
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4718,34 +4780,34 @@
 "因為和 Gadu-Gadu HTTP 伺服器溝通時發生問題,所以 Gaim 沒有辦法完成您所指定的"
 "工作。請待會兒重試。"
 
-#: src/protocols/gg/gg.c:1200
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "無法匯入 Gadu-Gadu 的好友清單"
 
-#: src/protocols/gg/gg.c:1201
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim 無法連上 Gadu-Gadu 好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1274
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "無法匯出好友清單"
 
-#: src/protocols/gg/gg.c:1275 src/protocols/gg/gg.c:1298
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim 無法連上好友清單伺服器。請晚點再試一次。"
 
-#: src/protocols/gg/gg.c:1297
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "無法刪除 Gadu-Gadu 好友清單"
 
-#: src/protocols/gg/gg.c:1348
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "無法存取目錄"
 
-#: src/protocols/gg/gg.c:1349
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4753,11 +4815,11 @@
 "因為 Gaim 沒有辦法連上名錄伺服器,所以無法搜尋名錄上的資料。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1383
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "無法修改 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:1384
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4765,32 +4827,33 @@
 "因為 Gaim 沒有辦法連上 Gadu-Gadu 伺服器,所以無法修改您的密碼。請待會兒再試一"
 "次。"
 
-#: src/protocols/gg/gg.c:1401
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "名錄搜尋"
 
-#: src/protocols/gg/gg.c:1410 src/protocols/jabber/jabber.c:1060
-#: src/protocols/toc/toc.c:1553
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
+#: src/protocols/toc/toc.c:1558
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/gg/gg.c:1418
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "自伺服器上匯入好友名單"
 
-#: src/protocols/gg/gg.c:1424
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "匯出好友名單到伺服器上"
 
-#: src/protocols/gg/gg.c:1430
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "將伺服器上的好友名單刪除"
 
-#: src/protocols/gg/gg.c:1464
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "無法讀取使用者簡介檔。"
 
-#: src/protocols/gg/gg.c:1465
+#: src/protocols/gg/gg.c:1461
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4808,7 +4871,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1607 src/protocols/gg/gg.c:1609
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
@@ -4823,15 +4886,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
 #: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:2931
-#: src/protocols/oscar/oscar.c:5452
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorize"
 msgstr "給予認證"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
 #: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:2933
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:6060
 msgid "Deny"
 msgstr "拒絕"
 
@@ -4893,71 +4956,72 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 無法開啟監聽埠。"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6537
-#: src/protocols/yahoo/yahoo.c:2456
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/protocols/irc/irc.c:168 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:372 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:506 src/protocols/silc/chat.c:1264
+#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
 #: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:509 src/protocols/silc/chat.c:1267
-#: src/protocols/silc/ops.c:1001 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "主題"
 
@@ -4970,32 +5034,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:613
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
-#: src/protocols/irc/irc.c:630 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1385 src/protocols/napster/napster.c:655
+#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:633 src/protocols/jabber/jabber.c:1406
-#: src/protocols/msn/msn.c:1725 src/protocols/napster/napster.c:660
-#: src/protocols/silc/silc.c:1044 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "通訊埠"
 
-#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1399
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:639 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "使用者"
 
@@ -5023,7 +5089,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo.c:3058
 msgid "Realname"
 msgstr "姓名"
 
@@ -5146,7 +5213,7 @@
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:862
+#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
@@ -5174,9 +5241,9 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
+#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
 msgid "Disconnected."
 msgstr "停止連線。"
 
@@ -5208,20 +5275,24 @@
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:606 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -5229,85 +5300,86 @@
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "市/村"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "省/州"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
 #: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "郵遞區號"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:632
-#: src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
 msgid "Title"
 msgstr "職銜"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4839
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber 帳號"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2734
-#: src/protocols/novell/novell.c:2738 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Status"
 msgstr "狀態"
 
@@ -5316,57 +5388,62 @@
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1388
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "標誌"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Jabber 個人資料"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:961
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
@@ -5471,7 +5548,7 @@
 msgstr "對工作階段進行初始化時發生了錯誤"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
@@ -5515,7 +5592,7 @@
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
@@ -5527,7 +5604,7 @@
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "密碼"
 
@@ -5536,13 +5613,14 @@
 msgstr "電子郵件"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4267
-#: src/protocols/oscar/oscar.c:4275 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
+#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:641 src/protocols/silc/silc.c:634
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "電話"
 
@@ -5560,9 +5638,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:2097 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
+#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
 #: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "連線中"
@@ -5579,9 +5657,9 @@
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5823
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -5635,8 +5713,8 @@
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4836
-#: src/protocols/oscar/oscar.c:6432
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:6622
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
@@ -5652,138 +5730,154 @@
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: src/protocols/jabber/jabber.c:1041 src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1539
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1136
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
-# TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1140
+#  NOTE Jabber 錯誤 <conflict/>,表示已透過同一名稱或在同一位址,以相同的 Resource
+#  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#: src/protocols/jabber/jabber.c:1138
 msgid "Conflict"
-msgstr "衝突"
-
-#: src/protocols/jabber/jabber.c:1142
+msgstr "名稱或位址衝突"
+
+#: src/protocols/jabber/jabber.c:1140
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
-# TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1144
+#  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: src/protocols/jabber/jabber.c:1142
 msgid "Forbidden"
-msgstr ""
-
-# TODO 要看Jabber標準
-#: src/protocols/jabber/jabber.c:1146
+msgstr "權限不夠"
+
+#  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: src/protocols/jabber/jabber.c:1144
 msgid "Gone"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+msgstr "已離線"
+
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1154
+#  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
+#  NOTE 條件(例如訊息中含有禁字),以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1158
 msgid "Payment Required"
 msgstr "必須付款"
 
-#: src/protocols/jabber/jabber.c:1162
+#  NOTE Jabber 錯誤 <recipient-unavailable/>
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE「暫時無法聯絡」應該比「不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: src/protocols/jabber/jabber.c:1160
 msgid "Recipient Unavailable"
-msgstr "接收者不存在"
-
-#: src/protocols/jabber/jabber.c:1166
+msgstr "暫時無法聯絡接收者"
+
+#: src/protocols/jabber/jabber.c:1164
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1166
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
+#: src/protocols/jabber/jabber.c:1168
+msgid "Remote Server Timeout"
+msgstr "遠端伺服器逾時"
+
 #: src/protocols/jabber/jabber.c:1170
-msgid "Remote Server Timeout"
-msgstr "遠端伺服器逾時"
-
-#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
-#: src/protocols/jabber/jabber.c:1174
+#  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
-msgstr "伺服器不存在"
-
-# TODO 要看Jabber標準
-# XXX 暫時假設「Subscription」一詞為Jabber術語,譯「認證」,需要核實
-#: src/protocols/jabber/jabber.c:1176
+msgstr "不提供該項服務"
+
+#  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
+#  NOTE 必須事先取得「Subscription」(認證)
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: src/protocols/jabber/jabber.c:1174
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:1176
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1183
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: src/protocols/jabber/jabber.c:1187
+#: src/protocols/jabber/jabber.c:1185
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1199
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/jabber.c:1203
+#: src/protocols/jabber/jabber.c:1201
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
+#: src/protocols/jabber/jabber.c:1205
+msgid "Bad Format"
+msgstr "無效的格式"
+
 #: src/protocols/jabber/jabber.c:1207
-msgid "Bad Format"
-msgstr "無效的格式"
-
-#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -5793,119 +5887,119 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1214
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1232
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1234
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1236
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1238
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1252
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "隱藏作業系統"
 
@@ -5919,26 +6013,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1364 src/protocols/jabber/jabber.c:1366
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1396
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "強迫使用舊式 SSL"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1410 src/protocols/silc/silc.c:1040
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6012,12 +6106,12 @@
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
@@ -6170,14 +6264,15 @@
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#  XXX 暫譯
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: src/protocols/msn/error.c:114
 msgid "Service Temporarily Unavailable"
-msgstr "服務暫時不存在。"
+msgstr "暫時無法使用服務"
 
 #: src/protocols/msn/error.c:117
 msgid "Database server error"
@@ -6266,8 +6361,8 @@
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1356
-#: src/protocols/silc/ops.c:1198 src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
 msgid "Authentication failed"
 msgstr "認證失敗"
 
@@ -6301,38 +6396,38 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: src/protocols/msn/msn.c:79
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:187
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:188
+#: src/protocols/msn/msn.c:190
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:200
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:232
+#: src/protocols/msn/msn.c:238
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6340,93 +6435,93 @@
 "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動"
 "裝置上呢?"
 
-#: src/protocols/msn/msn.c:236
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:672
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:674
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:676
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2718
-#: src/protocols/novell/novell.c:2833 src/protocols/novell/novell.c:2887
-#: src/protocols/silc/buddy.c:1364 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
 msgid "Busy"
 msgstr "忙碌"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:678
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:680
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:682
-#: src/protocols/zephyr/zephyr.c:1180 src/protocols/zephyr/zephyr.c:1195
+#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "隱藏"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "設定暱稱"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "設定住家電話號碼"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "設定工作電話號碼"
 
-#: src/protocols/msn/msn.c:397
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "設定行動電話號碼"
 
-#: src/protocols/msn/msn.c:406
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "開啟 / 關閉行動裝置"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "允許 / 不允許 Mobile Page"
 
-#: src/protocols/msn/msn.c:442
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: src/protocols/msn/msn.c:452
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "開啟聊天室"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:476
+#: src/protocols/msn/msn.c:482
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6434,7 +6529,7 @@
 "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://"
 "gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:799
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6443,12 +6538,12 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的允許清單。"
 
-#: src/protocols/msn/msn.c:803 src/protocols/msn/msn.c:840
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "無效的 MSN 使用者帳號"
 
 # MSN6.0中文版對「Block」一詞的譯文為「封鎖」
-#: src/protocols/msn/msn.c:836
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6457,83 +6552,83 @@
 "MSN 的帳號必需為「user@server.com」的格式。或許您所指的是 %s@hotmail.com。目"
 "前將不會變更您的封鎖清單。"
 
-#: src/protocols/msn/msn.c:1302 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>讀取個人資訊時發生錯誤</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1372 src/protocols/oscar/oscar.c:4252
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3066
 msgid "Age"
 msgstr "年齡"
 
 #. Gender
-#: src/protocols/msn/msn.c:1379 src/protocols/oscar/oscar.c:4238
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: src/protocols/msn/msn.c:1394 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1402 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "職業"
 
-#: src/protocols/msn/msn.c:1419 src/protocols/msn/msn.c:1425
-#: src/protocols/msn/msn.c:1432 src/protocols/msn/msn.c:1439
-#: src/protocols/msn/msn.c:1446
+#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
+#: src/protocols/msn/msn.c:1452
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1468
-#: src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1490
-#: src/protocols/msn/msn.c:1497
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: src/protocols/msn/msn.c:1506 src/protocols/msn/msn.c:1512
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
+#: src/protocols/yahoo/yahoo.c:3113
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: src/protocols/msn/msn.c:1520 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "更新日期"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1531 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "網頁"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/msn.c:1553 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/msn/msn.c:1612
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
 msgstr "顯示「交談視窗已關閉」的通知"
 
-#: src/protocols/msn/msn.c:1617
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "顯示「交談已逾時」的通知"
 
@@ -6547,15 +6642,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1720 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "登入伺服器"
 
-#: src/protocols/msn/msn.c:1729
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
@@ -6580,7 +6675,7 @@
 msgstr "讀取好友清單中"
 
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "密碼送出"
 
@@ -6685,54 +6780,50 @@
 msgid "An MSN message may not have been received."
 msgstr "有個 MSN 訊息可能沒被收到。"
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr "無法由伺服器讀取資訊。指令為 %hd,長度為 %hd。"
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:243
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
+
+#: src/protocols/napster/napster.c:306
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者:%s,檔案:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:317
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "您已經停止與伺服器的連線。"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "您被中斷連線,因為您由其他的地方登入。"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/silc/chat.c:741
-msgid "Get Info"
-msgstr "取得資訊"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5523
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1274
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -6746,10 +6837,138 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:637 src/protocols/napster/napster.c:639
+#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "沒有提供所需的參數"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "無法寫入網路"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "無法由網路讀取"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "和伺服器溝通時發生錯誤"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "找不到該會議"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "該會議並不存在"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "那個目錄已經存在"
+
+#  XXX 這個太奇怪了 (^^;)
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "不支援"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "密碼已過期"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "密碼無效"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "找不到該使用者"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "帳號已被停用"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "伺服器無法存取目錄"
+
+#  XXX 要覆查譯文
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "您的系統管理員不容許這個動作"
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "暫時無法使用伺服器;請稍後重試"
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "無法在同一資料夾內新增同一好友兩次"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "無法新增您自己至好友清單"
+
+#  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "Master archive 設定錯誤"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "使用者名稱或密碼無效"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "無法辦識您所輸入的主機或使用者名稱"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "您不能在同一交談內新增同一個人兩次"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "您的好友人數已達上限"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "您輸入了無效的使用者名稱"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "更新目錄途中發生錯誤"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "協定版本不相容"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "該使用者拒絕了您"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "試用版最多只容許十個使用者同時登入"
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "未知錯誤:0x%X"
+
 #: src/protocols/novell/novell.c:119
 #, c-format
 msgid "Login failed (%s)."
@@ -6827,7 +7046,7 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1568
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
@@ -6837,7 +7056,7 @@
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1607
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
@@ -6868,39 +7087,39 @@
 msgstr "使用者資訊"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:1558
+#: src/protocols/novell/novell.c:1566
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1621
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "處理事件或回覆時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:1647
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1662
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: src/protocols/novell/novell.c:1795
+#: src/protocols/novell/novell.c:1803
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: src/protocols/novell/novell.c:1822
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: src/protocols/novell/novell.c:1823
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6911,16 +7130,16 @@
 "\n"
 "時間:%s"
 
-#: src/protocols/novell/novell.c:1825
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:1930
+#: src/protocols/novell/novell.c:1938
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:1984
+#: src/protocols/novell/novell.c:1992
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6930,35 +7149,35 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2082
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:2104
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:2413
+#: src/protocols/novell/novell.c:2421
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#: src/protocols/novell/novell.c:2724 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5825 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:2735
+#: src/protocols/novell/novell.c:2743
 msgid "Message"
 msgstr "訊息"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2890
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
 msgstr "離線"
 
-#: src/protocols/novell/novell.c:3283
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
@@ -6972,156 +7191,158 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/novell/novell.c:3356 src/protocols/novell/novell.c:3358
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3375
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3379
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:185
-msgid "Rate to client"
-msgstr "到客戶端速率"
-
-#: src/protocols/oscar/oscar.c:187
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-#: src/protocols/oscar/oscar.c:188
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
 #: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
+msgid "Rate to client"
+msgstr "到客戶端速率"
+
+#  XXX 可能是誤譯
 #: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "客戶端不支援"
+msgid "Service unavailable"
+msgstr "伺服器不存在"
 
 #: src/protocols/oscar/oscar.c:192
+msgid "Service not defined"
+msgstr "沒有指定服務"
+
+#: src/protocols/oscar/oscar.c:193
+msgid "Obsolete SNAC"
+msgstr "過時的 SNAC"
+
+#: src/protocols/oscar/oscar.c:194
+msgid "Not supported by host"
+msgstr "伺服器不支援"
+
+#: src/protocols/oscar/oscar.c:195
+msgid "Not supported by client"
+msgstr "客戶端不支援"
+
+#: src/protocols/oscar/oscar.c:196
 msgid "Refused by client"
 msgstr "被客戶端拒絕"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:197
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:198
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:199
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:200
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:434 src/protocols/silc/silc.c:630
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6545
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -7132,106 +7353,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:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4845
-#: src/protocols/oscar/oscar.c:6435
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6625
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4839
-#: src/protocols/oscar/oscar.c:6433
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
+#: src/protocols/oscar/oscar.c:6623
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4842
-#: src/protocols/oscar/oscar.c:6434
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
+#: src/protocols/oscar/oscar.c:6624
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "和 %s 的即時訊息關閉"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "和 %s 的即時訊息失敗"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "直接連線失敗"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "和 %s 的即時訊息已經被建立"
+
+#: src/protocols/oscar/oscar.c:906
+#, 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:1322
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
+
+#: src/protocols/oscar/oscar.c:1327
+msgid "Unable to open Direct IM"
+msgstr "無法開啟直接的即時訊息"
+
+#: src/protocols/oscar/oscar.c:1362
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
+
+#: src/protocols/oscar/oscar.c:1366
+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:1370 src/protocols/oscar/oscar.c:3290
+msgid "Connect"
+msgstr "連線"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "您已經由聊天室 %s 停止連線。"
 
-#: src/protocols/oscar/oscar.c:805
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "目前無法使用聊天室"
 
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7241,45 +7500,47 @@
 "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
 "並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "無法登入到 AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1449
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "連線已建立,並已送出 Cookie"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "無法開啟新連結。"
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "無法建立監聽器 Socket。"
 
-#: src/protocols/oscar/oscar.c:1333 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1342
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr "AOL 即時訊息服務暫時不存在。"
-
-#: src/protocols/oscar/oscar.c:1347
+msgstr "暫時無法使用 AOL 即時訊息服務。"
+
+#: src/protocols/oscar/oscar.c:2001
 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."
@@ -7287,21 +7548,21 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:2006
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的客戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:1384
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "內部錯誤"
 
-#: src/protocols/oscar/oscar.c:1456
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:1522
-#: src/protocols/oscar/oscar.c:1610
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7310,29 +7571,24 @@
 "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
 "沒有更新。"
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:2267
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:2195 src/protocols/oscar/oscar.c:5929
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "和 %s 的即時訊息已經被建立"
-
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:2551
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
 msgid "(There was an error receiving this message)"
 msgstr "(收取這個訊息時發生錯誤)"
 
-#: src/protocols/oscar/oscar.c:2712
+#: src/protocols/oscar/oscar.c:3282
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: src/protocols/oscar/oscar.c:2715
+#: src/protocols/oscar/oscar.c:3285
 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 "
@@ -7341,46 +7597,42 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
-#: src/protocols/oscar/oscar.c:2720 src/protocols/oscar/oscar.c:6309
-msgid "Connect"
-msgstr "連線"
-
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:3321
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:3329
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3330
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:2787
+#: src/protocols/oscar/oscar.c:3360
 #, 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:2792 src/protocols/oscar/oscar.c:2794
+#: src/protocols/oscar/oscar.c:3365 src/protocols/oscar/oscar.c:3367
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:2832
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:2921
-#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3285
-#: src/protocols/oscar/oscar.c:3345 src/protocols/oscar/oscar.c:5444
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
+#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
+#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6097
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:3423
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:2921
+#: src/protocols/oscar/oscar.c:3506
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7389,11 +7641,11 @@
 "使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2929 src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:3526
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7403,17 +7655,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3527
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:3534
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:2957
+#: src/protocols/oscar/oscar.c:3542
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7426,7 +7678,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:3550
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7439,7 +7691,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3558
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7452,34 +7704,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2994
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:3585
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:3004
+#: src/protocols/oscar/oscar.c:3589
 msgid "Decline"
 msgstr "婉拒"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3674
 #, 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:3098
+#: src/protocols/oscar/oscar.c:3683
 #, 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:3107
+#: src/protocols/oscar/oscar.c:3692
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7489,83 +7741,83 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3701
 #, 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:3125
+#: src/protocols/oscar/oscar.c:3710
 #, 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:3134
+#: src/protocols/oscar/oscar.c:3719
 #, 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:3188
+#: src/protocols/oscar/oscar.c:3780
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3247
+#: src/protocols/oscar/oscar.c:3839
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 丟出錯誤:%s\n"
 
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3840
 msgid "Unknown error"
 msgstr "未知錯誤"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3283
+#: src/protocols/oscar/oscar.c:3875
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "您要送給 %s 的訊息無法送出:"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:3342
+#: src/protocols/oscar/oscar.c:3934
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:3365
+#: src/protocols/oscar/oscar.c:3957
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3960
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:3372 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:4046
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:4232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:3858
+#: src/protocols/oscar/oscar.c:4450
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4451
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7573,142 +7825,142 @@
 "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再"
 "試一次。"
 
-#: src/protocols/oscar/oscar.c:3922
+#: src/protocols/oscar/oscar.c:4514
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "您被中斷連線,因為您由其他的地方登入這個帳號。"
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:4516
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:4547
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
 msgid "Email Address"
 msgstr "電子郵件"
 
-#: src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4830
 msgid "Not specified"
 msgstr "沒有填寫"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/oscar/oscar.c:4239 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/oscar/oscar.c:4255
+#: src/protocols/oscar/oscar.c:4847
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:4259
+#: src/protocols/oscar/oscar.c:4851
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:4264
+#: src/protocols/oscar/oscar.c:4856
 msgid "Home Address"
 msgstr "住家地址"
 
-#: src/protocols/oscar/oscar.c:4268 src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:4272
+#: src/protocols/oscar/oscar.c:4864
 msgid "Work Address"
 msgstr "工作地址"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4872
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4873
 msgid "Company"
 msgstr "公司名稱"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4874
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:4283
+#: src/protocols/oscar/oscar.c:4875
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:4285
+#: src/protocols/oscar/oscar.c:4877
 msgid "Web Page"
 msgstr "網頁"
 
-#: src/protocols/oscar/oscar.c:4291
+#: src/protocols/oscar/oscar.c:4883
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s 的 ICQ 資訊"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:4341
+#: src/protocols/oscar/oscar.c:4933
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4362
+#: src/protocols/oscar/oscar.c:4954
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "下列是 %s 的帳號"
 
-#: src/protocols/oscar/oscar.c:4366
+#: src/protocols/oscar/oscar.c:4958
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/protocols/oscar/oscar.c:4383
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "No results found for email address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:4404
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:4406
+#: src/protocols/oscar/oscar.c:4998
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:4434
+#: src/protocols/oscar/oscar.c:5026
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:4437
+#: src/protocols/oscar/oscar.c:5029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號以空白結束。"
 
-#: src/protocols/oscar/oscar.c:4443
+#: src/protocols/oscar/oscar.c:5035
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: src/protocols/oscar/oscar.c:4446
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7716,7 +7968,7 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為您已經送出的其他要求還未處理好。"
 
-#: src/protocols/oscar/oscar.c:4449
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7724,19 +7976,19 @@
 msgstr ""
 "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
 
-#: src/protocols/oscar/oscar.c:4452
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:4465
+#: src/protocols/oscar/oscar.c:5057
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7745,25 +7997,25 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4466 src/protocols/oscar/oscar.c:4473
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:4536
+#: src/protocols/oscar/oscar.c:5128
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:4694
+#: src/protocols/oscar/oscar.c:5301
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:4695
+#: src/protocols/oscar/oscar.c:5302
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -7772,7 +8024,7 @@
 "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後"
 "再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:5329
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7783,19 +8035,19 @@
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:4727
+#: src/protocols/oscar/oscar.c:5334
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:4743 src/protocols/oscar/oscar.c:6440
+#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
 msgid "Visible"
 msgstr "現身"
 
-#: src/protocols/oscar/oscar.c:4761
+#: src/protocols/oscar/oscar.c:5368
 msgid "Unable to set AIM away message."
 msgstr "無法設定 AIM 離開訊息。"
 
-#: src/protocols/oscar/oscar.c:4762
+#: src/protocols/oscar/oscar.c:5369
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7804,7 +8056,7 @@
 "您試著在登入程序完成前修改您的離開訊息,您的狀態將維持目前所設定的狀態。請在"
 "完全登入後再設定一次。"
 
-#: src/protocols/oscar/oscar.c:4802
+#: src/protocols/oscar/oscar.c:5409
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7815,11 +8067,11 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:4807
+#: src/protocols/oscar/oscar.c:5414
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:4893
+#: src/protocols/oscar/oscar.c:5500
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7830,16 +8082,16 @@
 "文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
 "字」組成。"
 
-#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:5311
-#: src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5931
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:5030
+#: src/protocols/oscar/oscar.c:5637
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5638
 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 "
@@ -7848,13 +8100,13 @@
 "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺"
 "失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:5207 src/protocols/oscar/oscar.c:5208
-#: src/protocols/oscar/oscar.c:5213 src/protocols/oscar/oscar.c:5368
-#: src/protocols/oscar/oscar.c:5369 src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
+#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
+#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:5310
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7863,11 +8115,11 @@
 "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
 "試。"
 
-#: src/protocols/oscar/oscar.c:5310 src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5930
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7877,7 +8129,7 @@
 "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超"
 "過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:5405
+#: src/protocols/oscar/oscar.c:6012
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7887,11 +8139,11 @@
 "呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:5411
+#: src/protocols/oscar/oscar.c:6018
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:5444
+#: src/protocols/oscar/oscar.c:6051
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7901,18 +8153,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6093
 #, 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:5487
+#: src/protocols/oscar/oscar.c:6094
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6097
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7922,89 +8174,74 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/oscar/oscar.c:6098
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:5528 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:5550
+#: src/protocols/oscar/oscar.c:6157
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:5640
+#: src/protocols/oscar/oscar.c:6247
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#: src/protocols/oscar/oscar.c:5797
+#: src/protocols/oscar/oscar.c:6404
 msgid "Away Message"
 msgstr "離開訊息"
 
-#: src/protocols/oscar/oscar.c:6289
-msgid "Unable to open Direct IM"
-msgstr "無法開啟直接的即時訊息"
-
-#: src/protocols/oscar/oscar.c:6302
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
-
-#: src/protocols/oscar/oscar.c:6305
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
-
-#: src/protocols/oscar/oscar.c:6490
+#: src/protocols/oscar/oscar.c:6688
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6706
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:6514
+#: src/protocols/oscar/oscar.c:6712
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:6529
+#: src/protocols/oscar/oscar.c:6724
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:6558
+#: src/protocols/oscar/oscar.c:6747
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:6777
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:6580
+#: src/protocols/oscar/oscar.c:6778
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:6586
+#: src/protocols/oscar/oscar.c:6785
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:6635
+#: src/protocols/oscar/oscar.c:6837
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6882
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:6682
+#: src/protocols/oscar/oscar.c:6885
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:6683
+#: src/protocols/oscar/oscar.c:6886
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8012,76 +8249,76 @@
 "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
 "「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6903
 msgid "Find Buddy by E-mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:6700
+#: src/protocols/oscar/oscar.c:6904
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:6701
+#: src/protocols/oscar/oscar.c:6905
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:6718
+#: src/protocols/oscar/oscar.c:6922
 msgid "Available Message:"
 msgstr "上線訊息:"
 
 # XXX 請覆查
-#: src/protocols/oscar/oscar.c:6719
+#: src/protocols/oscar/oscar.c:6923
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "我在工作,但覺得很悶,同我聊聊天吧!"
 
-#: src/protocols/oscar/oscar.c:6795
+#: src/protocols/oscar/oscar.c:7004
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
-#: src/protocols/oscar/oscar.c:6802
+#: src/protocols/oscar/oscar.c:7009
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:6810
+#: src/protocols/oscar/oscar.c:7015
 msgid "Set Available Message..."
 msgstr "設定上線訊息..."
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:7020
 msgid "Change Password..."
 msgstr "修改密碼..."
 
-#: src/protocols/oscar/oscar.c:6824
+#: src/protocols/oscar/oscar.c:7025
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6832
+#: src/protocols/oscar/oscar.c:7029
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:6843
+#: src/protocols/oscar/oscar.c:7038
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:6849
+#: src/protocols/oscar/oscar.c:7042
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:7046
 msgid "Display Currently Registered Address"
 msgstr "顯示目前所註冊的地址"
 
-#: src/protocols/oscar/oscar.c:6861
+#: src/protocols/oscar/oscar.c:7050
 msgid "Change Currently Registered Address..."
 msgstr "修改目前所註冊的地址..."
 
-#: src/protocols/oscar/oscar.c:6870
+#: src/protocols/oscar/oscar.c:7057
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:6878
+#: src/protocols/oscar/oscar.c:7063
 msgid "Search for Buddy by Email..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:6885
+#: src/protocols/oscar/oscar.c:7068
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
@@ -8095,20 +8332,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:7006 src/protocols/oscar/oscar.c:7008
+#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7204
 msgid "Auth host"
 msgstr "認證伺服器"
 
-#: src/protocols/oscar/oscar.c:7030
+#: src/protocols/oscar/oscar.c:7209
 msgid "Auth port"
 msgstr "認證通訊埠"
 
-#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:401
-#: src/protocols/silc/buddy.c:512 src/protocols/silc/buddy.c:661
+#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
+#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
 #: src/protocols/silc/ft.c:340
 #, c-format
 msgid "User %s is not present in the network"
@@ -8149,8 +8386,8 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
-#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:369
-#: src/protocols/silc/buddy.c:480
+#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
+#: src/protocols/silc/buddy.c:500
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
@@ -8176,55 +8413,55 @@
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: src/protocols/silc/buddy.c:368 src/protocols/silc/buddy.c:403
-#: src/protocols/silc/buddy.c:445
+#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
+#: src/protocols/silc/buddy.c:451
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:404
+#: src/protocols/silc/buddy.c:410
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:446
+#: src/protocols/silc/buddy.c:452
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: src/protocols/silc/buddy.c:479 src/protocols/silc/buddy.c:514
-#: src/protocols/silc/ops.c:1064 src/protocols/silc/ops.c:1075
+#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:515 src/protocols/silc/ops.c:1065
-#: src/protocols/silc/ops.c:1076
+#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: src/protocols/silc/buddy.c:584 src/protocols/silc/buddy.c:1596
+#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: src/protocols/silc/buddy.c:585 src/protocols/silc/buddy.c:944
-#: src/protocols/silc/chat.c:210
+#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/chat.c:218
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:662 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:892 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:976 src/protocols/silc/ops.c:982
-#: src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:663 src/protocols/silc/ops.c:893
+#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: src/protocols/silc/buddy.c:684
+#: src/protocols/silc/buddy.c:722
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: src/protocols/silc/buddy.c:687
+#: src/protocols/silc/buddy.c:725
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8232,132 +8469,204 @@
 "直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公"
 "鑰」指令即可。"
 
-#: src/protocols/silc/buddy.c:987
+#: src/protocols/silc/buddy.c:1025
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: src/protocols/silc/buddy.c:990
+#: src/protocols/silc/buddy.c:1028
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
 
-#: src/protocols/silc/buddy.c:993
+#: src/protocols/silc/buddy.c:1031
 msgid "Import..."
 msgstr "匯入..."
 
-#: src/protocols/silc/buddy.c:1080
+#: src/protocols/silc/buddy.c:1118
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: src/protocols/silc/buddy.c:1082
+#: src/protocols/silc/buddy.c:1120
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1084
+#: src/protocols/silc/buddy.c:1122
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1358
+#: src/protocols/silc/buddy.c:1396
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: src/protocols/silc/buddy.c:1362 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1366 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1368 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: src/protocols/silc/buddy.c:1370
+#: src/protocols/silc/buddy.c:1408
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1377 src/protocols/silc/silc.c:605
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "開心"
 
-#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:607
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "憂愁"
 
-#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:609
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "憤怒"
 
-#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:611
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:613
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:615
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "無敵"
 
-#: src/protocols/silc/buddy.c:1389 src/protocols/silc/silc.c:617
+#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "戀愛中"
 
-#: src/protocols/silc/buddy.c:1391 src/protocols/silc/silc.c:619
+#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "想睡"
 
-#: src/protocols/silc/buddy.c:1393 src/protocols/silc/silc.c:621
+#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "發悶"
 
-#: src/protocols/silc/buddy.c:1395 src/protocols/silc/silc.c:623
+#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "興奮"
 
-#: src/protocols/silc/buddy.c:1397 src/protocols/silc/silc.c:625
+#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1471
+msgid "Modes"
+msgstr "模式"
+
+#: src/protocols/silc/buddy.c:1481
+msgid "Mood"
+msgstr "心情"
+
+#: src/protocols/silc/buddy.c:1511
+msgid "Status Text"
+msgstr "狀態訊息"
+
+#: src/protocols/silc/buddy.c:1516
+msgid "Preferred Contact"
+msgstr "聯絡方法"
+
+#: src/protocols/silc/buddy.c:1524
+msgid "Paging"
+msgstr "傳呼"
+
+#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "視像會議"
+
+#: src/protocols/silc/buddy.c:1537
+msgid "Preferred Language"
+msgstr "選用語文"
+
+#: src/protocols/silc/buddy.c:1542
+msgid "Device"
+msgstr "所用裝置"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Computer"
+msgstr "電腦"
+
+#: src/protocols/silc/buddy.c:1548
+msgid "PDA"
+msgstr "電子手帳"
+
+#: src/protocols/silc/buddy.c:1550
+msgid "Terminal"
+msgstr "終端機"
+
+#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "時區"
+
+#: src/protocols/silc/buddy.c:1567
+msgid "Geolocation"
+msgstr "所在位置"
+
+#: src/protocols/silc/buddy.c:1626
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:1582
+#: src/protocols/silc/buddy.c:1631
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: src/protocols/silc/buddy.c:1588
+#: src/protocols/silc/buddy.c:1635
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:1602
+#: src/protocols/silc/buddy.c:1646
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1609
+#: src/protocols/silc/buddy.c:1651
 msgid "Send File..."
 msgstr "傳送檔案..."
 
-#: src/protocols/silc/buddy.c:1616 src/protocols/silc/ops.c:1111
+#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
@@ -8370,8 +8679,8 @@
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:153
-#: src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
 msgid "Channel Information"
 msgstr "頻道資訊"
 
@@ -8379,24 +8688,24 @@
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: src/protocols/silc/chat.c:209
+#: src/protocols/silc/chat.c:217
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:264
+#: src/protocols/silc/chat.c:272
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: src/protocols/silc/chat.c:375
+#: src/protocols/silc/chat.c:383
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: src/protocols/silc/chat.c:382
+#: src/protocols/silc/chat.c:390
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: src/protocols/silc/chat.c:387
+#: src/protocols/silc/chat.c:395
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8409,119 +8718,123 @@
 "道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:396 src/protocols/silc/chat.c:397
-#: src/protocols/silc/chat.c:434 src/protocols/silc/chat.c:435
-#: src/protocols/silc/chat.c:773
+#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:873
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:536
+#: src/protocols/silc/chat.c:562
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:540 src/protocols/silc/ops.c:1387
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/protocols/silc/chat.c:551
+#: src/protocols/silc/chat.c:577
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: src/protocols/silc/chat.c:553
+#: src/protocols/silc/chat.c:579
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:654
+#: src/protocols/silc/chat.c:706
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: src/protocols/silc/chat.c:655
+#: src/protocols/silc/chat.c:707
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: src/protocols/silc/chat.c:750
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "取得資訊"
+
+#: src/protocols/silc/chat.c:856
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:756
+#: src/protocols/silc/chat.c:860
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: src/protocols/silc/chat.c:765
+#: src/protocols/silc/chat.c:867
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: src/protocols/silc/chat.c:780
+#: src/protocols/silc/chat.c:878
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: src/protocols/silc/chat.c:786
+#: src/protocols/silc/chat.c:882
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:795
+#: src/protocols/silc/chat.c:889
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: src/protocols/silc/chat.c:802
+#: src/protocols/silc/chat.c:894
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: src/protocols/silc/chat.c:808
+#: src/protocols/silc/chat.c:898
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: src/protocols/silc/chat.c:816
+#: src/protocols/silc/chat.c:904
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: src/protocols/silc/chat.c:822
+#: src/protocols/silc/chat.c:908
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: src/protocols/silc/chat.c:830
+#: src/protocols/silc/chat.c:914
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: src/protocols/silc/chat.c:836
+#: src/protocols/silc/chat.c:918
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:988
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:992
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:961
+#: src/protocols/silc/chat.c:1042
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: src/protocols/silc/chat.c:963
+#: src/protocols/silc/chat.c:1044
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:964
+#: src/protocols/silc/chat.c:1045
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1146 src/protocols/silc/silc.c:844
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1147 src/protocols/silc/silc.c:845
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
 msgid "Unknown command"
 msgstr "未知的指令"
 
@@ -8532,7 +8845,7 @@
 #: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
 #: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
 msgid "Secure File Transfer"
-msgstr "加密檔案傳輸"
+msgstr "安全的檔案傳輸"
 
 #: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
 #: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
@@ -8621,269 +8934,175 @@
 msgstr "從伺服器登出"
 
 #: src/protocols/silc/ops.c:767
-msgid ""
-"Personal Information:\n"
-"\n"
-msgstr ""
-"個人資訊:\n"
-"\n"
-
-#: src/protocols/silc/ops.c:769
-#, c-format
-msgid "Full Name:\t\t%s\n"
-msgstr "全名:   \t%s\n"
-
-#: src/protocols/silc/ops.c:772
-#, c-format
-msgid "First Name:\t%s\n"
-msgstr "名:    \t%s\n"
-
-# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/silc/ops.c:775
-#, c-format
-msgid "Middle Names:\t%s\n"
-msgstr "英文別名: \t%s\n"
-
-#: src/protocols/silc/ops.c:778
-#, c-format
-msgid "Family Name:\t%s\n"
-msgstr "姓:    \t%s\n"
-
-#: src/protocols/silc/ops.c:781 src/protocols/silc/ops.c:911
-#, c-format
-msgid "Nickname:\t\t%s\n"
-msgstr "暱稱:   \t%s\n"
-
-#: src/protocols/silc/ops.c:784
-#, c-format
-msgid "Birth Day:\t\t%s\n"
-msgstr "生日:   \t%s\n"
-
-#: src/protocols/silc/ops.c:787
-#, c-format
-msgid "Job Title:\t\t%s\n"
-msgstr "職銜:   \t%s\n"
+msgid "Personal Information"
+msgstr "個人資訊"
 
 #: src/protocols/silc/ops.c:790
-#, c-format
-msgid "Job Role:\t\t%s\n"
-msgstr "職責:   \t%s\n"
-
-#: src/protocols/silc/ops.c:793
-#, c-format
-msgid "Organization:\t%s\n"
-msgstr "所屬機構: \t%s\n"
-
-#: src/protocols/silc/ops.c:796
-#, c-format
-msgid "Unit:\t\t%s\n"
-msgstr "部門:   \t%s\n"
-
-#: src/protocols/silc/ops.c:799
-#, c-format
-msgid "Homepage:\t%s\n"
-msgstr "網頁:   \t%s\n"
-
-#: src/protocols/silc/ops.c:802
-#, c-format
-msgid "Address:\t%s\n"
-msgstr "地址:   \t%s\n"
+msgid "Birth Day"
+msgstr "生日"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "職銜"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "職責"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "所屬機構"
 
 #: src/protocols/silc/ops.c:806
-#, c-format
-msgid "Tel:\t\t\t%s\n"
-msgstr "電話:   \t%s\n"
-
-#: src/protocols/silc/ops.c:811
-#, c-format
-msgid "EMail:\t\t%s\n"
-msgstr "電子郵件: \t%s\n"
-
-#: src/protocols/silc/ops.c:815
-#, c-format
-msgid ""
-"\n"
-"Note:\t\t%s\n"
-msgstr ""
-"\n"
-"備註:   \t%s\n"
-
-#: src/protocols/silc/ops.c:862
+msgid "Unit"
+msgstr "部門"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "電子郵件"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "備註"
+
+#: src/protocols/silc/ops.c:878
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:913
-#, c-format
-msgid "Real Name:\t%s\n"
-msgstr "姓名:   \t%s\n"
-
-#: src/protocols/silc/ops.c:915
-#, c-format
-msgid "Username:\t\t%s\n"
-msgstr "使用者名稱:\t%s\n"
-
-#: src/protocols/silc/ops.c:917
-#, c-format
-msgid "Hostname:\t\t%s\n"
-msgstr "主機名稱: \t%s\n"
-
-#: src/protocols/silc/ops.c:919
-#, c-format
-msgid "Server:\t\t%s\n"
-msgstr "伺服器:  \t%s\n"
-
-#: src/protocols/silc/ops.c:924
-#, c-format
-msgid "User Mode:\t%s\n"
-msgstr "使用者模式:\t%s\n"
-
-#: src/protocols/silc/ops.c:938
-msgid ""
-"\n"
-"Channels:\n"
-msgstr ""
-"\n"
-"頻道:\n"
-
-#: src/protocols/silc/ops.c:965
-#, c-format
-msgid ""
-"\n"
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"\n"
-"公鑰指紋:\n"
-"%s\n"
-"\n"
-
-#: src/protocols/silc/ops.c:966
-#, c-format
-msgid ""
-"Public Key Babbleprint:\n"
-"%s"
-msgstr ""
-"公鑰 Babbleprint:\n"
-"%s"
-
-#: src/protocols/silc/ops.c:979
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "主機名稱"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "使用者模式"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "頻道"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "公鑰指紋"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "公鑰指紋可讀版本 (Babbleprint)"
+
+#: src/protocols/silc/ops.c:995
 msgid "More..."
 msgstr "顯示細節..."
 
-#: src/protocols/silc/ops.c:990 src/protocols/silc/silc.c:744
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:990
+#: src/protocols/silc/ops.c:1006
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1001
+#: src/protocols/silc/ops.c:1017
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1029
+#: src/protocols/silc/ops.c:1045
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1029
+#: src/protocols/silc/ops.c:1045
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1077
+#: src/protocols/silc/ops.c:1093
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1090 src/protocols/silc/ops.c:1103
-#: src/protocols/silc/ops.c:1104
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1091
+#: src/protocols/silc/ops.c:1107
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1112
+#: src/protocols/silc/ops.c:1128
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1189
+#: src/protocols/silc/ops.c:1205
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1194
+#: src/protocols/silc/ops.c:1210
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1203
+#: src/protocols/silc/ops.c:1219
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1209
-msgid "Connection timeout"
-msgstr "連線已逾時"
-
-#: src/protocols/silc/ops.c:1238
+#: src/protocols/silc/ops.c:1254
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1298 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1300
+#: src/protocols/silc/ops.c:1316
 msgid "Authenticating connection"
-msgstr "驗證連線中"
-
-#: src/protocols/silc/ops.c:1347
+msgstr "為連線進行驗證中"
+
+#: src/protocols/silc/ops.c:1363
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1388
+#: src/protocols/silc/ops.c:1404
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1417
+#: src/protocols/silc/ops.c:1433
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的客戶端程式"
 
-#: src/protocols/silc/ops.c:1420
+#: src/protocols/silc/ops.c:1436
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "失敗:遠端不信任/不支援您的公鑰"
-
-#: src/protocols/silc/ops.c:1423
+msgstr "失敗:遠端不信任/不支援您的公鑰"
+
+#: src/protocols/silc/ops.c:1439
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1426
+#: src/protocols/silc/ops.c:1442
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
-#: src/protocols/silc/ops.c:1429
+#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#: src/protocols/silc/ops.c:1445
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "失敗:遠端不支援建議中的 PKCS"
-
-#: src/protocols/silc/ops.c:1432
+msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
+
+#: src/protocols/silc/ops.c:1448
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
-#: src/protocols/silc/ops.c:1435
+#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28    
+#: src/protocols/silc/ops.c:1451
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "失敗:遠端不支援建議中的 HMAC"
-
-#: src/protocols/silc/ops.c:1437
+msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
+
+#: src/protocols/silc/ops.c:1453
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1439
+#: src/protocols/silc/ops.c:1455
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1450
+#: src/protocols/silc/ops.c:1466
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -8892,7 +9111,7 @@
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。接受這個公鑰嗎?"
+msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎?"
 
 #: src/protocols/silc/pk.c:108
 #, c-format
@@ -8907,7 +9126,7 @@
 "%s\n"
 "%s\n"
 msgstr ""
-"%s 的公鑰的指紋及 babbleprint 為:\n"
+"%s 的公鑰的指紋及其可讀版本 (babbleprint) 為:\n"
 "\n"
 "%s\n"
 "%s\n"
@@ -8945,15 +9164,15 @@
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: src/protocols/silc/silc.c:601
+#: src/protocols/silc/silc.c:602
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:603
+#: src/protocols/silc/silc.c:604
 msgid "Normal"
 msgstr "正常"
 
-#: src/protocols/silc/silc.c:628
+#: src/protocols/silc/silc.c:629
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -8961,50 +9180,34 @@
 "\n"
 "聯絡方法"
 
-#: src/protocols/silc/silc.c:636
-msgid "SMS"
-msgstr "SMS"
-
-#: src/protocols/silc/silc.c:638
-msgid "MMS"
-msgstr "MMS"
-
-#: src/protocols/silc/silc.c:640
-msgid "Video Conferencing"
-msgstr "視像會議"
-
-#: src/protocols/silc/silc.c:645
+#: src/protocols/silc/silc.c:646
 msgid "Your Current Status"
 msgstr "目前狀態"
 
-#: src/protocols/silc/silc.c:652
+#: src/protocols/silc/silc.c:653
 #, fuzzy
 msgid "Online Services"
 msgstr "上線自"
 
-#: src/protocols/silc/silc.c:655
+#: src/protocols/silc/silc.c:656
 msgid "Let others see what services you are using"
 msgstr ""
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: src/protocols/silc/silc.c:661
+#: src/protocols/silc/silc.c:662
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: src/protocols/silc/silc.c:668
+#: src/protocols/silc/silc.c:669
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
-#: src/protocols/silc/silc.c:673 src/protocols/silc/silc.c:675
-msgid "Timezone"
-msgstr "時區"
-
 #  XXX 好像很怪
-#: src/protocols/silc/silc.c:681 src/protocols/silc/silc.c:682
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:684
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9013,64 +9216,64 @@
 "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別"
 "人看得見的各項。"
 
-#: src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:723
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:721
+#: src/protocols/silc/silc.c:724
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: src/protocols/silc/silc.c:737
+#: src/protocols/silc/silc.c:740
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: src/protocols/silc/silc.c:750
+#: src/protocols/silc/silc.c:749
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:815
+#: src/protocols/silc/silc.c:813
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: src/protocols/silc/silc.c:895
+#: src/protocols/silc/silc.c:907
 msgid "Instant Messages"
 msgstr "即時訊息"
 
-#: src/protocols/silc/silc.c:900
+#: src/protocols/silc/silc.c:912
 msgid "Digitally sign all IM messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/silc.c:905
+#: src/protocols/silc/silc.c:917
 msgid "Verify all IM message signatures"
 msgstr "核實所有即時訊息的簽章"
 
-#: src/protocols/silc/silc.c:908
+#: src/protocols/silc/silc.c:920
 msgid "Channel Messages"
 msgstr "頻道訊息"
 
-#: src/protocols/silc/silc.c:913
+#: src/protocols/silc/silc.c:925
 msgid "Digitally sign all channel messages"
 msgstr "數位簽署所有頻道訊息"
 
-#: src/protocols/silc/silc.c:918
+#: src/protocols/silc/silc.c:930
 msgid "Verify all channel message signatures"
 msgstr "核實所有頻道訊息的簽章"
 
-#: src/protocols/silc/silc.c:921
+#: src/protocols/silc/silc.c:933
 msgid "Default SILC Key Pair"
 msgstr "預設的 SILC Key Pair"
 
-#: src/protocols/silc/silc.c:926
+#: src/protocols/silc/silc.c:938
 msgid "SILC Public Key"
 msgstr "SILC 公鑰"
 
-#: src/protocols/silc/silc.c:931
+#: src/protocols/silc/silc.c:943
 msgid "SILC Private Key"
 msgstr "SILC 私鑰"
 
@@ -9084,43 +9287,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1016
+#: src/protocols/silc/silc.c:1026
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1018
+#: src/protocols/silc/silc.c:1028
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
 #  XXX
-#: src/protocols/silc/silc.c:1047
+#: src/protocols/silc/silc.c:1058
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
-#: src/protocols/silc/silc.c:1053
+#: src/protocols/silc/silc.c:1064
 msgid "Public Key File"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1057
+#: src/protocols/silc/silc.c:1068
 msgid "Private Key File"
 msgstr "私鑰檔案"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1062
+#: src/protocols/silc/silc.c:1073
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1065
+#: src/protocols/silc/silc.c:1076
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1068
+#: src/protocols/silc/silc.c:1079
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1071
+#: src/protocols/silc/silc.c:1082
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
@@ -9128,115 +9331,139 @@
 msgid "Creating SILC key pair..."
 msgstr "建立 SILC key pair 中..."
 
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "姓名"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "使用者名稱"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "主機名稱"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "演算法"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "密鑰長度"
+
 #: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: src/protocols/toc/toc.c:167
+#: src/protocols/toc/toc.c:166
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:510
+#: src/protocols/toc/toc.c:509
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:512
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:515
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:518
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:521
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:524
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:530
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:533
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:536
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:539
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:542
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:545
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
-#: src/protocols/toc/toc.c:549
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: src/protocols/toc/toc.c:548
 msgid "Dir service temporarily unavailable."
-msgstr "目錄服務暫時不存在。"
-
-#: src/protocols/toc/toc.c:552
+msgstr "暫時無法使用目錄服務。"
+
+#: src/protocols/toc/toc.c:551
 msgid "Email lookup restricted."
 msgstr "禁止 eMail 檢查。"
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:554
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:557
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:560
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:564
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:568
+#: src/protocols/toc/toc.c:567
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
-#: src/protocols/toc/toc.c:574
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: src/protocols/toc/toc.c:573
 msgid "The service is temporarily unavailable."
-msgstr "服務暫時不存在。"
-
-#: src/protocols/toc/toc.c:577
+msgstr "暫時無法使用該項服務。"
+
+#: src/protocols/toc/toc.c:576
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: src/protocols/toc/toc.c:580
+#: src/protocols/toc/toc.c:579
 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."
@@ -9244,37 +9471,37 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:581
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:584
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:604
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:644
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:714
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:902
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
+#: src/protocols/toc/toc.c:906
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
+
 #: src/protocols/toc/toc.c:907
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
-
-#: src/protocols/toc/toc.c:908
 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 "
@@ -9283,44 +9510,44 @@
 "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
 "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1417
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1553
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1671
+#: src/protocols/toc/toc.c:1675
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1707
+#: src/protocols/toc/toc.c:1711
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1752 src/protocols/toc/toc.c:1792
-#: src/protocols/toc/toc.c:1916 src/protocols/toc/toc.c:2004
+#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
+#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:1949
+#: src/protocols/toc/toc.c:1953
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2049
+#: src/protocols/toc/toc.c:2053
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2087
 #, 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:2090
+#: src/protocols/toc/toc.c:2094
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -9335,15 +9562,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2172 src/protocols/toc/toc.c:2174
+#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2195
 msgid "TOC host"
 msgstr "TOC 伺服器"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2199
 msgid "TOC port"
 msgstr "TOC 通訊埠"
 
@@ -9401,11 +9628,10 @@
 msgid "Profile"
 msgstr "個人資料"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "設定個人資料"
 
-# XXX 好像不太對
 # NOTE 譯文更動 by Paladin
 #: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
@@ -9430,37 +9656,37 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1280 src/protocols/trepia/trepia.c:1282
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia 協定模組"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:307
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "您已經被登出,因為您已在另一處登入。"
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "您的 Yahoo! 訊息並沒有被送出。"
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "嗶!"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:868
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:869
+#: src/protocols/yahoo/yahoo.c:871
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9469,11 +9695,11 @@
 "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1601
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9483,11 +9709,11 @@
 "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功"
 "登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1677
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9496,69 +9722,69 @@
 "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並"
 "隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1719
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "你的帳戶目前被封鎖。請您登入 Yahoo 網站。"
 
-#: src/protocols/yahoo/yahoo.c:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "未知的錯誤代碼 %d。"
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1779
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
+#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Not At Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Not At Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2776
 msgid "Not In Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -9566,11 +9792,11 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -9581,77 +9807,77 @@
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:2973
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>對不起,暫時並不支援內容被列為兒童不宜的個人資訊。</b><br><br>\n"
 
 # NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結<br>"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2996
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>對不起,暫時只支援英文的個人資訊。</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/yahoo/yahoo.c:3095
 msgid "Hobbies"
 msgstr "嗜好"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo.c:3076
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo.c:3080
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo.c:3082
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
@@ -9665,27 +9891,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3311
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "傳呼系統伺服器"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "檔案傳輸主機"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "聊天室清單所在網址"
 
@@ -9787,28 +10013,23 @@
 "accounts on it when logged in as the same user."
 msgstr "因為 Zephyr 用您登入系統的帳號,您是不可能擁有多個 Zephyr 帳戶的。"
 
-# NOTE 這是法文po檔所用的處理方法,我認為比較清楚
-#: src/protocols/zephyr/zephyr.c:1165
-msgid "ZLocate"
-msgstr "名錄搜尋 (ZLocate)"
-
 # XXX 暫譯
 # NOTE 之前的搜尋結果(下列第一個鏈結)是說 Class 不是類別,
 # NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:1207
+#: src/protocols/zephyr/zephyr.c:1191
 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:1213
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1219
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
@@ -9822,7 +10043,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1371 src/protocols/zephyr/zephyr.c:1373
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
@@ -9832,18 +10053,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:1390
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:1393
+#: src/protocols/zephyr/zephyr.c:1377
 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:1396
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "現身程度"
 
@@ -9885,58 +10106,58 @@
 msgid "Please enter your password"
 msgstr "請輸入您的密碼"
 
-#: src/server.c:914
+#: src/server.c:917
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d 個訊息)"
 msgstr[1] "(%d 個訊息)"
 
-#: src/server.c:928
+#: src/server.c:931
 msgid "(1 message)"
 msgstr "(一個訊息)"
 
-#: src/server.c:1108 src/server.c:1118
+#: src/server.c:1111 src/server.c:1121
 #, c-format
 msgid "%s logged in."
 msgstr "%s 登入。"
 
-#: src/server.c:1131
+#: src/server.c:1134
 #, c-format
 msgid "%s signed on"
 msgstr "%s 已經登入"
 
-#: src/server.c:1147
+#: src/server.c:1150
 #, c-format
 msgid "%s came back"
 msgstr "%s 回來了"
 
-#: src/server.c:1149
+#: src/server.c:1152
 #, c-format
 msgid "%s went away"
 msgstr "%s 已經離開"
 
-#: src/server.c:1164
+#: src/server.c:1167
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/server.c:1178
+#: src/server.c:1181
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/server.c:1189 src/server.c:1197
+#: src/server.c:1192 src/server.c:1200
 #, c-format
 msgid "%s logged out."
 msgstr "%s 登出。"
 
-#: src/server.c:1211
+#: src/server.c:1214
 #, c-format
 msgid "%s signed off"
 msgstr "%s 已經登出"
 
-#: src/server.c:1261
+#: src/server.c:1264
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -9945,11 +10166,11 @@
 "%s 剛剛被 %s 警告了。\n"
 "您的新警告等級為 %d%%"
 
-#: src/server.c:1264
+#: src/server.c:1267
 msgid "an anonymous person"
 msgstr "一個匿名者"
 
-#: src/server.c:1374
+#: src/server.c:1377
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -9958,12 +10179,12 @@
 "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 "%s"
 
-#: src/server.c:1378
+#: src/server.c:1381
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "使用者「%s」邀請 %s 到好友聊天室:「%s」\n"
 
-#: src/server.c:1384
+#: src/server.c:1387
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
@@ -9990,33 +10211,33 @@
 msgid "_Warn"
 msgstr "警告(_W)"
 
-#: src/util.c:2120
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2123
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2154 src/util.c:2159 src/util.c:2164 src/util.c:2167
+#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
 msgid "day"
 msgid_plural "days"
 msgstr[0] "日"
 msgstr[1] "日"
 
-#: src/util.c:2155 src/util.c:2159 src/util.c:2173 src/util.c:2175
+#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小時"
 msgstr[1] "小時"
 
-#: src/util.c:2155 src/util.c:2164 src/util.c:2173 src/util.c:2178
+#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 msgstr[1] "分"
 
-#: src/util.c:2515
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
@@ -10032,14 +10253,84 @@
 msgid "Notification"
 msgstr "通知"
 
-#~ msgid "Ignore c_olors"
-#~ msgstr "忽略顏色(_O)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "忽略字體(_F)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "忽略字體大小(_Z)"
+#~ msgid "Full Name:\t\t%s\n"
+#~ msgstr "全名:   \t%s\n"
+
+#~ msgid "First Name:\t%s\n"
+#~ msgstr "名:    \t%s\n"
+
+# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
+# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
+#~ msgid "Middle Names:\t%s\n"
+#~ msgstr "英文別名: \t%s\n"
+
+#~ msgid "Family Name:\t%s\n"
+#~ msgstr "姓:    \t%s\n"
+
+#~ msgid "Nickname:\t\t%s\n"
+#~ msgstr "暱稱:   \t%s\n"
+
+#~ msgid "Birth Day:\t\t%s\n"
+#~ msgstr "生日:   \t%s\n"
+
+#~ msgid "Unit:\t\t%s\n"
+#~ msgstr "部門:   \t%s\n"
+
+#~ msgid "Homepage:\t%s\n"
+#~ msgstr "網頁:   \t%s\n"
+
+#~ msgid "Address:\t%s\n"
+#~ msgstr "地址:   \t%s\n"
+
+#~ msgid "Tel:\t\t\t%s\n"
+#~ msgstr "電話:   \t%s\n"
+
+#~ msgid "EMail:\t\t%s\n"
+#~ msgstr "電子郵件: \t%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Note:\t\t%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "備註:   \t%s\n"
+
+#~ msgid "Real Name:\t%s\n"
+#~ msgstr "姓名:   \t%s\n"
+
+#~ msgid "Username:\t\t%s\n"
+#~ msgstr "使用者名稱:\t%s\n"
+
+#~ msgid "Hostname:\t\t%s\n"
+#~ msgstr "主機名稱: \t%s\n"
+
+#~ msgid "Server:\t\t%s\n"
+#~ msgstr "伺服器:  \t%s\n"
+
+#~ msgid "Connection timeout"
+#~ msgstr "連線已逾時"
+
+# NOTE 這是法文po檔所用的處理方法,我認為比較清楚
+#~ msgid "ZLocate"
+#~ msgstr "名錄搜尋 (ZLocate)"
+
+#~ msgid "_Show people joining in window"
+#~ msgstr "在視窗中顯示其他人進入的事件(_S)"
+
+#~ msgid "_Show people leaving in window"
+#~ msgstr "在視窗中顯示其他人離開的事件(_S)"
+
+#~ msgid "I_ndividual log file for each buddy's signons"
+#~ msgstr "以個別的日誌記錄個別好友的登入(_N)"
+
+#~ msgid "Fonts"
+#~ msgstr "字型"
+
+#~ msgid "Set"
+#~ msgstr "設定帳號"
+
+#~ msgid "idle for"
+#~ msgstr "閒置時間"
 
 #~ msgid "Buddy List Toolbar"
 #~ msgstr "好友清單工具列"
@@ -10112,9 +10403,6 @@
 #~ msgid "Rendezvous Protocol Plugin"
 #~ msgstr "Rendezvous 協定模組"
 
-#~ msgid "Host name"
-#~ msgstr "主機名稱"
-
 #~ msgid "First name"
 #~ msgstr "名"